aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java2
-rw-r--r--plugin/icedteanp/java/sun/applet/PluginDebug.java2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d069cb..da9c5a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-20 Jiri Vanek <[email protected]>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (isPluginDebug)
+ made private to prevent confusion.
+ * plugin/icedteanp/java/sun/applet/PluginDebug.java: (DEBUG) initialized
+ from JNLPRuntime.isDebug instead of incorrect JNLPRuntime.isPluginDebug.
+
2013-10-17 Andrew Azores <[email protected]>
Back out changeset 420d72e5cee7 due to breaking LiveConnect feature.
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
index 9045c83..a0744a0 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
@@ -755,7 +755,7 @@ public class JNLPRuntime {
JNLPRuntime.ignoreHeaders = ignoreHeaders;
}
- public static boolean isPluginDebug() {
+ private static boolean isPluginDebug() {
if (pluginDebug == null) {
try {
//there are cases when this itself is not allowed by security manager, and so
diff --git a/plugin/icedteanp/java/sun/applet/PluginDebug.java b/plugin/icedteanp/java/sun/applet/PluginDebug.java
index 8de96f1..ef34ceb 100644
--- a/plugin/icedteanp/java/sun/applet/PluginDebug.java
+++ b/plugin/icedteanp/java/sun/applet/PluginDebug.java
@@ -42,7 +42,7 @@ import net.sourceforge.jnlp.util.logging.OutputController;
public class PluginDebug {
- static final boolean DEBUG = JNLPRuntime.isPluginDebug();
+ static final boolean DEBUG = JNLPRuntime.isDebug();
public static void debug(Object... messageChunks) {
if (DEBUG) {