aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java9
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dfb90b..3a38fd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-08 Omair Majid <[email protected]>
+
+ * netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
+ (initFromBrowserConfig): Do not try to create a URL from null.
+ (getFromBrowser): Only print informational messages in debug mode.
+
2011-02-01 Omair Majid <[email protected]>
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
diff --git a/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java b/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
index c53b36b..fb08325 100644
--- a/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
+++ b/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
@@ -120,7 +120,10 @@ public class BrowserAwareProxySelector extends JNLPProxySelector {
}
try {
- browserAutoConfigUrl = new URL(prefs.get("network.proxy.autoconfig_url"));
+ String url = prefs.get("network.proxy.autoconfig_url");
+ if (url != null) {
+ browserAutoConfigUrl = new URL(url);
+ }
} catch (MalformedURLException e) {
e.printStackTrace();
}
@@ -195,7 +198,9 @@ public class BrowserAwareProxySelector extends JNLPProxySelector {
if (optionDescription == null) {
optionDescription = "Unknown";
}
- System.err.println(R("RProxyFirefoxOptionNotImplemented", browserProxyType, optionDescription));
+ if (JNLPRuntime.isDebug()) {
+ System.err.println(R("RProxyFirefoxOptionNotImplemented", browserProxyType, optionDescription));
+ }
proxies.add(Proxy.NO_PROXY);
}