[jboss-cvs] JBossAS SVN: r102225 - trunk/system/src/main/java/org/jboss/system/server/profileservice/repository.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2010-03-10 08:30:52 -0500 (Wed, 10 Mar 2010)
New Revision: 102225

Modified:
   trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
   trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
   trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java
Log:
cleanup deployment references.

Modified: trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java	2010-03-10 13:28:11 UTC (rev 102224)
+++ trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java	2010-03-10 13:30:52 UTC (rev 102225)
@@ -103,13 +103,19 @@
       
       // Get the deployment
       ProfileDeployment deployment = super.removeDeployment(vfsPath);
-      // Remove the entries
-      this.contentFlags.remove(deployment.getName());
       // Return
       return deployment;
    }
 
    @Override
+   protected void cleanupDeployment(String deploymentName)
+   {
+      super.cleanupDeployment(deploymentName);
+      // Remove the entries
+      this.contentFlags.remove(deploymentName);      
+   }
+   
+   @Override
    public ProfileDeployment getDeployment(String vfsPath) throws NoSuchDeploymentException
    {
       if(vfsPath == null)

Modified: trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java	2010-03-10 13:28:11 UTC (rev 102224)
+++ trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java	2010-03-10 13:30:52 UTC (rev 102225)
@@ -225,15 +225,27 @@
       String deploymentName = deployment.getName();
       // Remove the entries
       this.applicationCtxs.remove(deploymentName);
-      this.applicationVFCache.remove(deploymentName);
-      // Cleanup the backup
-      deploymentFactory.cleanup(deploymentName);
+      cleanupDeployment(deploymentName);
       // Update last modified
       updateLastModfied();
       // Return
       return deployment;
    }
    
+   protected void cleanupDeployment(String deploymentName)
+   {
+      try
+      {
+         this.applicationVFCache.remove(deploymentName);
+         // Cleanup the backup
+         deploymentFactory.cleanup(deploymentName);
+      }
+      catch(Exception e)
+      {
+         log.debug("failed to cleanup deployment " + deploymentName, e);
+      }
+   }
+   
    /**
     * Load all the applications under the applicationDir.
     * 

Modified: trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java	2010-03-10 13:28:11 UTC (rev 102224)
+++ trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java	2010-03-10 13:30:52 UTC (rev 102225)
@@ -115,6 +115,7 @@
                   iter.remove();
                   // Remove last modified cache
                   cleanUpRoot(root);
+                  cleanupDeployment(pathName);
                   if (trace)
                      log.trace(pathName + " was removed");
                }