blob: 365449095739a8216cc78f6b4383e52d97472a18 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
One of the recent fixes to openjdk - 8004584.patch.jdk - have removed potentionaly dangerous
retriving of application context:
public AppletSecurity() {
reset();
- mainAppContext = AppContext.getAppContext();
}
By this itw stopped working.
I have started with simple patch yesterday morning, Adam continued in his timezone and me back today
... merged result is attached:)
Thanx!
J.
-------------- next part --------------
diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200
@@ -35,6 +35,8 @@
import net.sourceforge.jnlp.cache.UpdatePolicy;
import net.sourceforge.jnlp.security.viewer.CertificateViewer;
import net.sourceforge.jnlp.services.ServiceUtil;
+import sun.awt.AppContext;
+import sun.awt.SunToolkit;
/**
* This is the main entry point for the JNLP client. The main
@@ -113,6 +115,9 @@
* Launch the JNLP file specified by the command-line arguments.
*/
public static void main(String[] argsIn) {
+ if (AppContext.getAppContext() == null) {
+ SunToolkit.createNewAppContext();
+ }
args = argsIn;
if (null != getOption("-viewer")) {
diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200
@@ -234,7 +234,7 @@
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Exception e) {
- // ignore it
+ e.printStackTrace();
}
doMainAppContextHacks();
diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200
@@ -72,6 +72,8 @@
import java.net.ProxySelector;
import java.util.Enumeration;
import java.util.Properties;
+import sun.awt.AppContext;
+import sun.awt.SunToolkit;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
@@ -94,6 +96,9 @@
*/
public static void main(String args[])
throws IOException {
+ if (AppContext.getAppContext() == null) {
+ SunToolkit.createNewAppContext();
+ }
if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
System.err.println("Invalid pipe names provided. Refusing to proceed.");
System.exit(1);
|
