From 15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Mon, 9 Jul 2012 15:12:11 -0400
Subject: NO_HASHCODE_OVERRIDDEN

---
 .../src/com/netscape/cms/publish/publishers/FileBasedPublisher.java | 6 ++++--
 base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'base/common/src/com/netscape/cms')

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