diff options
| author | Abhishek Koneru <akoneru@redhat.com> | 2012-07-09 15:12:11 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-07-12 16:42:18 -0400 |
| commit | 15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd (patch) | |
| tree | f3bd2a816e816ad565f13ce90816a7fd7fb32454 /base/common/src/com/netscape/cms | |
| parent | 9e4e40b80de0ba47702392b9ad6ccecf67496db7 (diff) | |
| download | pki-15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd.tar.gz pki-15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd.tar.xz pki-15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd.zip | |
NO_HASHCODE_OVERRIDDEN
Diffstat (limited to 'base/common/src/com/netscape/cms')
| -rw-r--r-- | base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java | 6 | ||||
| -rw-r--r-- | base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java index 6a1d528ac..c48aa2db4 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java @@ -366,8 +366,9 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { destName = baseName + ".der"; destFile = new File(destName); - if (destFile.exists()) + if (destFile.exists()) { destFile.delete(); + } renameFile = new File(tempFile); renameFile.renameTo(destFile); @@ -402,8 +403,9 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { destName = baseName + ".b64"; destFile = new File(destName); - if (destFile.exists()) + if (destFile.exists()) { destFile.delete(); + } renameFile = new File(tempFile); renameFile.renameTo(destFile); } diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java index 6f9f43d3a..a8a4008b7 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java @@ -75,7 +75,9 @@ public class CMSStartServlet extends HttpServlet { // Remove the original file if and only if // the backup copy was successful. if (f.exists()) { - f1.delete(); + if (!f1.delete()) { + CMS.debug("CMSStartServlet: init: Cannot delete file : " + old_path); + } // Make certain that the new file has // the correct permissions. |