svn commit: r1038928 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers: AbstractSynapseArtifactDeployer.java SynapseArtifactDeploymentStore.java

[supun]

Author: supun
Date: Thu Nov 25 06:01:57 2010
New Revision: 1038928

URL: http://svn.apache.org/viewvc?rev=1038928&view=rev
Log:
applying patch for issue SYNAPSE-713, many thanks Heshan for the contribution

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java?rev=1038928&r1=1038927&r2=1038928&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
 Thu Nov 25 06:01:57 2010
@@ -225,9 +225,11 @@ public abstract class AbstractSynapseArt
                     log.debug("Marking artifact as updating from file : " + 
fileName);
                 }
                 // if the file exists, which means it has been updated and is 
a Hot-Update case
-                deploymentStore.addUpdatingArtifact(
-                        fileName, 
deploymentStore.getArtifactNameForFile(fileName));
-                deploymentStore.removeArtifactWithFileName(fileName);
+                if (!deploymentStore.isRestoredFile(fileName)) {
+                    deploymentStore.addUpdatingArtifact(
+                            fileName, 
deploymentStore.getArtifactNameForFile(fileName));
+                    deploymentStore.removeArtifactWithFileName(fileName);
+                }
             } else {
                 // if the file doesn't exists then it is an actual undeployment
                 String artifactName = 
deploymentStore.getArtifactNameForFile(fileName);

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java?rev=1038928&r1=1038927&r2=1038928&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java
 Thu Nov 25 06:01:57 2010
@@ -41,10 +41,8 @@ import java.util.Map;
  * @see org.apache.synapse.config.xml.MultiXMLConfigurationBuilder
  */
 public final class SynapseArtifactDeploymentStore {
-    public static final String SYNAPSE_ARTIFACT_DEPLOYMENT_STORE = 
"SYNAPSE_ARTIFACT_DEPLOYMENT_STORE"; 
-
     /** Keeps track of the deployed artifacts in the synapse environment */
-    private static Map<String, String> fileName2ArtifactName = new 
HashMap<String, String>();
+    private Map<String, String> fileName2ArtifactName = new HashMap<String, 
String>();
 
     /** Keeps track of the updating artifacts in the synapse environment in a 
particular instance */
     private Map<String, String> updatingArtifacts = new HashMap<String, 
String>();