[jboss-cvs] JBossAS SVN: r102272 - trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting.

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

Author: emuckenhuber
Date: 2010-03-11 05:03:54 -0500 (Thu, 11 Mar 2010)
New Revision: 102272

Modified:
   trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
   trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
Log:
better handling of setting the locked deployment content flag

Modified: trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
===================================================================
--- trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java	2010-03-11 10:02:23 UTC (rev 102271)
+++ trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java	2010-03-11 10:03:54 UTC (rev 102272)
@@ -297,6 +297,7 @@
       ProfileKey key = deploymentTarget.getProfile();
       String profileName = key.getName();
       String deploymentName = createDeploymentName(vf);
+      deploymentRepository.lockDeploymentContent(deploymentName);
       // Don't try to re-mount
       if(deploymentRepository.getDeploymentNames().contains(deploymentName) == false)
       {
@@ -304,7 +305,6 @@
          // Add deployment
          deploymentRepository.addDeployment(deployment.getName(), deployment);         
       }
-      deploymentRepository.lockDeploymentContent(deploymentName);
       
       log.info("End handle stream, repositoryName: " + repositoryName);
       // Return the repository names
@@ -334,6 +334,14 @@
       }
       // Process
       deployer.process();
+      
+      // unlock the deployment content
+      for(String name : names)
+      { 
+         DeploymentRepository deploymentRepository = resolveDeploymentRepository(name, dtID.getProfile());
+         deploymentRepository.unlockDeploymentContent(name);
+      }
+      
       // CheckComplete
       deployer.checkComplete(
             deployments.toArray(new String[deployments.size()]));

Modified: trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
===================================================================
--- trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/DeployHandler.java	2010-03-11 10:02:23 UTC (rev 102271)
+++ trunk/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/DeployHandler.java	2010-03-11 10:03:54 UTC (rev 102272)
@@ -133,9 +133,9 @@
       }
       else
       {
-         // unlock 
+         // don't unlock here 
          ProfileDeployment deployment = deploymentRepository.getDeployment(name);
-         deploymentRepository.unlockDeploymentContent(deployment.getName());
+         // deploymentRepository.unlockDeploymentContent(deployment.getName());
          return deployment;
       }
    }