Mercurial > hg > release > icedtea-web-1.7

changeset 1408:1dcfb724b44c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: .old properties file removed before original is renamed. On windows, rewriting was not working
author Jiri Vanek <jvanek@redhat.com>
date Thu, 27 Apr 2017 14:30:29 +0200
parents ba53197d6257
children 12ff8e03a116
files ChangeLog netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Apr 26 19:29:53 2017 +0200
+++ b/ChangeLog	Thu Apr 27 14:30:29 2017 +0200
@@ -1,3 +1,8 @@
+2017-04-27  Jiri Vanek <jvanek@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@redhat.com>
 
 	* Makefile.am: (composeclasspath) is now quoting its result. Needed
--- 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:30:29 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);
             }