8235151: Nonexistent notifyQuit method referred from iOS GlassHelper.m

Reviewed-by: jvos
openjdk · Dec 4, 2019 · 2d4096a · 2d4096a
1 parent 98035cb
commit 2d4096a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/modules/javafx.graphics/src/main/native-glass/ios/GlassApplication.m b/modules/javafx.graphics/src/main/native-glass/ios/GlassApplication.m
@@ -381,7 +381,7 @@ - (void)callQuit
  GET_MAIN_JENV;
  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
  {
- (*env)->CallVoidMethod(env, self.jApplication, [GlassHelper ApplicationNotifyQuitMethod]);
+ (*env)->CallVoidMethod(env, self.jApplication, [GlassHelper ApplicationNotifyWillQuitMethod]);
  }
  [pool drain];
  GLASS_CHECK_EXCEPTION(env);

diff --git a/modules/javafx.graphics/src/main/native-glass/ios/GlassHelper.h b/modules/javafx.graphics/src/main/native-glass/ios/GlassHelper.h
@@ -46,7 +46,7 @@
 + (jmethodID)ApplicationNotifyDidBecomeActiveMethod;
 + (jmethodID)ApplicationNotifyWillResignActiveMethod;
 + (jmethodID)ApplicationNotifyDidResignActiveMethod;
-+ (jmethodID)ApplicationNotifyQuitMethod;
++ (jmethodID)ApplicationNotifyWillQuitMethod;
 + (jmethodID)ApplicationNotifyDidReceiveMemoryWarningMethod;
 
 @end
diff --git a/modules/javafx.graphics/src/main/native-glass/ios/GlassHelper.m b/modules/javafx.graphics/src/main/native-glass/ios/GlassHelper.m
@@ -223,20 +223,20 @@ + (jmethodID)ApplicationNotifyDidReceiveMemoryWarningMethod
 }
 
 
-+ (jmethodID)ApplicationNotifyQuitMethod
++ (jmethodID)ApplicationNotifyWillQuitMethod
 {
- static jmethodID _ApplicationNotifyQuitMethod = NULL;
- if (_ApplicationNotifyQuitMethod == NULL)
+ static jmethodID _ApplicationNotifyWillQuitMethod = NULL;
+ if (_ApplicationNotifyWillQuitMethod == NULL)
  {
  GET_MAIN_JENV;
- _ApplicationNotifyQuitMethod = (*env)->GetMethodID(env, [GlassHelper ApplicationClass], "notifyQuit", "()V");
+ _ApplicationNotifyWillQuitMethod = (*env)->GetMethodID(env, [GlassHelper ApplicationClass], "notifyWillQuit", "()V");
  GLASS_CHECK_EXCEPTION(env);
  }
- if (_ApplicationNotifyQuitMethod == NULL)
+ if (_ApplicationNotifyWillQuitMethod == NULL)
  {
- NSLog(@"GlassHelper error: _ApplicationNotifyQuitMethod == NULL");
+ NSLog(@"GlassHelper error: _ApplicationNotifyWillQuitMethod == NULL");
  }
- return _ApplicationNotifyQuitMethod;
+ return _ApplicationNotifyWillQuitMethod;
 }