Ticket #20956: patch-dock-args

File patch-dock-args, 817 bytes (added by johnsonlaucn@…, 13 years ago)

Patch file to ignore -Xdock:name and -Xdock:icon

Line 
1--- hotspot/src/share/vm/runtime/arguments.cpp.orig     2010-11-03 03:58:55.000000000 +0800
2+++ hotspot/src/share/vm/runtime/arguments.cpp  2010-11-03 03:57:20.000000000 +0800
3@@ -2552,6 +2552,14 @@
4           return JNI_EINVAL;
5         }
6       }
7+#ifdef __APPLE__
8+    } else if (match_option(option, "-Xdock:name=", &tail) || // -Xdock:name=
9+            match_option(option, "-Xdock:icon=", &tail)) { // -Xdock:icon
10+        // Certain application like NetBeans might need to set this option.
11+        // However, OpenJDK 6 on Darwin is an X11 application which may stop
12+        // the application setting these options stop working.
13+        // Simply ignore them to resolve this.
14+#endif // __APPLE__
15     // Unknown option
16     } else if (is_bad_option(option, args->ignoreUnrecognized)) {
17       return JNI_ERR;