[Dev] Patch for depsync premature update issue

[Afkham Azeez]

NuwanD please check the following:

azeez@azmac:~/projects/wso2/org/carbon/kernel/trunk/core/org.wso2.carbon.core$
svn diff
src/main/java/org/wso2/carbon/core/deployment/SynchronizeRepositoryRequest.java
src/main/java/org/wso2/carbon/core/deployment/CarbonDeploymentSchedulerTask.java

-------------------------------------------------------------------------------------------------------------------------

Index:
src/main/java/org/wso2/carbon/core/deployment/SynchronizeRepositoryRequest.java
===================================================================
---
src/main/java/org/wso2/carbon/core/deployment/SynchronizeRepositoryRequest.java
(revision
133403)
+++
src/main/java/org/wso2/carbon/core/deployment/SynchronizeRepositoryRequest.java
(working
copy)
@@ -30,6 +30,7 @@
 import org.wso2.carbon.core.CarbonAxisConfigurator;
 import org.wso2.carbon.core.internal.CarbonCoreDataHolder;
 import org.wso2.carbon.core.multitenancy.TenantAxisConfigurator;
+import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;

 /**
  * ClusterMessage for sending a deployment repository synchronization
request
@@ -37,14 +38,16 @@
 public class SynchronizeRepositoryRequest extends ClusteringMessage {

     private int tenantId;
+    private String  tenantDomain;
     private transient static final Log log =
LogFactory.getLog(SynchronizeRepositoryRequest.class);


     public SynchronizeRepositoryRequest() {
     }

-    public SynchronizeRepositoryRequest(int tenantId) {
+    public SynchronizeRepositoryRequest(int tenantId, String tenantDomain)
{
         this.tenantId = tenantId;
+        this.tenantDomain = tenantDomain;
     }

     public void setTenantId(int tenantId) {
@@ -52,8 +55,11 @@
     }

     public void execute(ConfigurationContext configContext) throws
ClusteringFault{
-        updateDeploymentRepository(configContext);
-        doDeployment(configContext);
+        // Run only if the tenant is loaded
+        if
(TenantAxisUtils.getTenantConfigurationContexts(configContext).get(tenantDomain)
!= null) {
+            updateDeploymentRepository(configContext);
+            doDeployment(configContext);
+        }
     }

     private void doDeployment(ConfigurationContext configContext) {
Index:
src/main/java/org/wso2/carbon/core/deployment/CarbonDeploymentSchedulerTask.java
===================================================================
---
src/main/java/org/wso2/carbon/core/deployment/CarbonDeploymentSchedulerTask.java
(revision
133403)
+++
src/main/java/org/wso2/carbon/core/deployment/CarbonDeploymentSchedulerTask.java
(working
copy)
@@ -155,7 +155,8 @@
             int numberOfRetries = 0;
             while (numberOfRetries < 60) {
                 try {
-                    clusteringAgent.sendMessage(new
SynchronizeRepositoryRequest(tenantId), true);
+                    clusteringAgent.sendMessage(new
SynchronizeRepositoryRequest(tenantId, tenantDomain),
+                                                true);
                     break;
                 } catch (ClusteringFault e) {
                     numberOfRetries++;

_______________________________________________
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev