/hg/icedtea-web: Try to be as silent about proxy settings as pos...

[omajid at icedtea.classpath.org]

changeset c0d4bd69b8f7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c0d4bd69b8f7
author: Omair Majid <omajid at redhat.com>
date: Tue Feb 08 16:51:56 2011 -0500

	Try to be as silent about proxy settings as possible

	2011-02-08 Omair Majid <omajid at redhat.com>

	 *
	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.


diffstat:

2 files changed, 13 insertions(+), 2 deletions(-)
ChangeLog                                                        |    6 ++++++
netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java |    9 +++++++--

diffs (39 lines):

diff -r 2d39fa58036e -r c0d4bd69b8f7 ChangeLog
--- a/ChangeLog	Tue Feb 01 21:07:03 2011 -0500
+++ b/ChangeLog	Tue Feb 08 16:51:56 2011 -0500
@@ -1,3 +1,9 @@ 2011-02-01  Omair Majid  <omajid at redhat.
+2011-02-08  Omair Majid  <omajid at redhat.com>
+
+	* 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  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
diff -r 2d39fa58036e -r c0d4bd69b8f7 netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
--- a/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java	Tue Feb 01 21:07:03 2011 -0500
+++ b/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java	Tue Feb 08 16:51:56 2011 -0500
@@ -120,7 +120,10 @@ public class BrowserAwareProxySelector e
         }
 
         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 e
                 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);
         }