/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset 1dcfb724b44c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1dcfb724b44c
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Apr 27 14:30:29 2017 +0200

	* netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: .old properties file removed before original is renamed. On windows, rewriting was not working


changeset 12ff8e03a116 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=12ff8e03a116
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Apr 27 14:32:19 2017 +0200

	* netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java: all win-slashes replaced by linux-slashes before uri is created


diffstat:

 ChangeLog                                                     |  10 ++++++++++
 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java |   6 ++++++
 netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java             |   2 +-
 3 files changed, 17 insertions(+), 1 deletions(-)

diffs (45 lines):

diff -r ba53197d6257 -r 12ff8e03a116 ChangeLog
--- a/ChangeLog	Wed Apr 26 19:29:53 2017 +0200
+++ b/ChangeLog	Thu Apr 27 14:32:19 2017 +0200
@@ -1,3 +1,13 @@
+2017-04-27  Jiri Vanek <jvanek at redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java: all win-slashes replaced by
+	linux-slashes before uri is created
+
+2017-04-27  Jiri Vanek <jvanek at redhat.com>
+
+	* netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: .old properties
+	file removed before original is renamed. On windows, rewriting was not working
+
 2017-04-26  Jiri Vanek <jvanek at redhat.com>
 
 	* Makefile.am: (composeclasspath) is now quoting its result. Needed
diff -r ba53197d6257 -r 12ff8e03a116 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java	Wed Apr 26 19:29:53 2017 +0200
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java	Thu Apr 27 14:32:19 2017 +0200
@@ -642,6 +642,12 @@
 
         File backupPropertiesFile = new File(userPropertiesFile.toString() + ".old");
         if (userPropertiesFile.isFile()) {
+            if (backupPropertiesFile.exists()){
+                boolean result = backupPropertiesFile.delete();
+                if(!result){
+                    OutputController.getLogger().log("Failed to delete backup properties file " + backupPropertiesFile+ " silently continuing.");
+                }
+            }
             if (!userPropertiesFile.renameTo(backupPropertiesFile)) {
                 throw new IOException("Error saving backup copy of " + userPropertiesFile);
             }
diff -r ba53197d6257 -r 12ff8e03a116 netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java	Wed Apr 26 19:29:53 2017 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java	Thu Apr 27 14:32:19 2017 +0200
@@ -185,7 +185,7 @@
         Policy policy = null;
         if (policyLocation != null) {
             try {
-                URI policyUri = new URI(policyLocation);
+                URI policyUri = new URI(policyLocation.replace("\\","/"));
                 policy = getInstance("JavaPolicy", new URIParameter(policyUri));
             } catch (IllegalArgumentException | NoSuchAlgorithmException | URISyntaxException e) {
                 OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);