/hg/release/icedtea-web-1.1: RH734081: Javaws cannot use proxy s...

[dbhole at icedtea.classpath.org]

changeset 506fd0d95206 in /hg/release/icedtea-web-1.1
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=506fd0d95206
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Aug 29 17:02:36 2011 -0400

	RH734081: Javaws cannot use proxy settings from Firefox

	Based on patch from Lukas Zachar <lzachar at redhat dot com>

	2011-08-29 Deepak Bhole <dbhole at redhat.com>

	 *
	netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java
	(find): Only process Profile sections. Do not throw an exception if
	a Default= line is not found since it is not guaranteed to
	exist.


diffstat:

 ChangeLog                                                       |  8 ++++++++
 NEWS                                                            |  1 +
 netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java |  4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 8214ff4fe80c -r 506fd0d95206 ChangeLog
--- a/ChangeLog	Wed Aug 24 15:17:46 2011 -0400
+++ b/ChangeLog	Mon Aug 29 17:02:36 2011 -0400
@@ -1,3 +1,11 @@
+2011-08-29  Deepak Bhole <dbhole at redhat.com>
+
+	RH734081: Javaws cannot use proxy settings from Firefox
+	Based on patch from Lukas Zachar <lzachar at redhat dot com>
+	* netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java
+	(find): Only process Profile sections. Do not throw an exception if a
+	Default= line is not found since it is not guaranteed to exist.
+
 2011-08-24  Deepak Bhole <dbhole at redhat.com>
 
 	RH718693: MindTerm SSH Applet doesn't work
diff -r 8214ff4fe80c -r 506fd0d95206 NEWS
--- a/NEWS	Wed Aug 24 15:17:46 2011 -0400
+++ b/NEWS	Mon Aug 29 17:02:36 2011 -0400
@@ -15,6 +15,7 @@
 Common
   - PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up
   - PR769: IcedTea-Web does not work with some ssl sites with OpenJDK7
+  - RH734081: Javaws cannot use proxy settings from Firefox
 
 New in release 1.1.1 (2011-07-20):
 * Security updates:
diff -r 8214ff4fe80c -r 506fd0d95206 netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java
--- a/netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java	Wed Aug 24 15:17:46 2011 -0400
+++ b/netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java	Mon Aug 29 17:02:36 2011 -0400
@@ -93,7 +93,7 @@
                 }
 
                 line = line.trim();
-                if (line.startsWith("[") && line.endsWith("]")) {
+                if (line.startsWith("[Profile") && line.endsWith("]")) {
                     if (foundDefaultSection) {
                         break;
                     }
@@ -115,7 +115,7 @@
             reader.close();
         }
 
-        if (!foundDefaultSection) {
+        if (!foundDefaultSection && linesInSection.size() == 0) {
             throw new FileNotFoundException("preferences file");
         }