Tested with ESB M4 release and the patch solves the issue. Committed the change to both trunk and C4 branch.
Thanks, NuwanD. On Mon, Jul 30, 2012 at 4:53 PM, Nuwan Dias <[email protected]> wrote: > Sure.. Will do. > > Thanks, > NuwanD. > > > On Mon, Jul 30, 2012 at 3:41 PM, Afkham Azeez <[email protected]> wrote: > >> 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++; >> > > > > -- > Nuwan Dias > > Software Engineer - WSO2, Inc. > Integration Technologies Team > email : [email protected] > Phone : +94 777 775 729 > > -- Nuwan Dias Software Engineer - WSO2, Inc. Integration Technologies Team email : [email protected] Phone : +94 777 775 729
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
