[wsas-java-dev] [wsas commit] r23 - wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service

[svn at wso2.com]

Author: azeez
Date: Thu Nov 30 05:04:41 2006
New Revision: 23

Modified:
   wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java
Log:
fix for WSAS-106. Displayed a message if the file cannot be deleted

Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java	(original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java	Thu Nov 30 05:04:41 2006
@@ -334,11 +334,13 @@
                                 "You may disable security for these services and retry.");
         }
 
-        pm.deleteKeyStore(keyStoreName);
         File ksFile = new File(filePath);
         if (!ksFile.delete()) {
-            msg = "Keystore file " + filePath + " was not deleted.";
+            msg = "Could not delete keystore file " + filePath +
+                  ". Due to a JVM issue on MS-Windows, files may not be deleted sometimes.";
+            throw new AxisFault(msg);
         }
+        pm.deleteKeyStore(keyStoreName);
         return msg;
     }