8245456: MacPasteboard throws ClassCastException on static builds

Jose Pereda · kevinrushforth · commit 37b5edc718c7 · 2020-05-20T13:21:45.000Z
Reviewed-by: kcr
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassPasteboard.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassPasteboard.m
@@ -459,7 +459,7 @@ static inline jobject createUTF(JNIEnv *env, NSString *data) {
         NSArray *items = [pasteboard pasteboardItems];
         if ([items count] > 0)
         {
-            jclass jcls = (*env)->FindClass(env, "java/lang/Object");
+            jclass jcls = (*env)->FindClass(env, "[Ljava/lang/String;");
             GLASS_CHECK_EXCEPTION(env);
             utfs = (*env)->NewObjectArray(env, (jsize)[items count], jcls, NULL);
             GLASS_CHECK_EXCEPTION(env);

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ static inline jobject createUTF(JNIEnv env, NSString data) {`
`459`	`459`	`NSArray *items = [pasteboard pasteboardItems];`
`460`	`460`	`if ([items count] > 0)`
`461`	`461`	`{`
`462`		`- jclass jcls = (*env)->FindClass(env, "java/lang/Object");`
	`462`	`+ jclass jcls = (*env)->FindClass(env, "[Ljava/lang/String;");`
`463`	`463`	`GLASS_CHECK_EXCEPTION(env);`
`464`	`464`	`utfs = (*env)->NewObjectArray(env, (jsize)[items count], jcls, NULL);`
`465`	`465`	`GLASS_CHECK_EXCEPTION(env);`