Do we need to add a test case for this fix? On Wed, Jan 11, 2012 at 12:29 PM, <[email protected]> wrote:
> Author: janaka > Date: Tue Jan 10 22:59:31 2012 > New Revision: 118822 > URL: http://wso2.org/svn/browse/wso2?view=rev&revision=118822 > > Log: > Adding fix for CARBON-11906 > > > Modified: > > trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/GovernanceArtifactManager.java > > trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/dataobjects/GovernanceArtifact.java > > trunk/carbon/components/governance/org.wso2.carbon.governance.generic/src/main/java/org/wso2/carbon/governance/generic/services/ManageGenericArtifactService.java > > Modified: > trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/GovernanceArtifactManager.java > URL: > http://wso2.org/svn/browse/wso2/trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/GovernanceArtifactManager.java?rev=118822&r1=118821&r2=118822&view=diff > > ============================================================================== > --- > trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/GovernanceArtifactManager.java > (original) > +++ > trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/GovernanceArtifactManager.java > Tue Jan 10 22:59:31 2012 > @@ -143,7 +143,8 @@ > pathExpression, artifact); > if (registry.resourceExists(path)) { > Resource oldResource = registry.get(path); > - resource.setProperties(new > Properties(oldResource.getProperties())); > + Properties properties = (Properties) > oldResource.getProperties().clone(); > + resource.setProperties(properties); > String oldContent; > Object content = oldResource.getContent(); > if (content instanceof String) { > > Modified: > trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/dataobjects/GovernanceArtifact.java > URL: > http://wso2.org/svn/browse/wso2/trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/dataobjects/GovernanceArtifact.java?rev=118822&r1=118821&r2=118822&view=diff > > ============================================================================== > --- > trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/dataobjects/GovernanceArtifact.java > (original) > +++ > trunk/carbon/components/governance/org.wso2.carbon.governance.api/src/main/java/org/wso2/carbon/governance/api/common/dataobjects/GovernanceArtifact.java > Tue Jan 10 22:59:31 2012 > @@ -222,6 +222,10 @@ > public void attachLifecycle(String name) throws GovernanceException { > String lifecycleName = getLifecycleName(); > try { > + if(name == null){ > + GovernanceUtils.removeAspect(path, name, registry); > + return; > + } > if (!name.equals(lifecycleName)) { > if (lifecycleName != null) { > GovernanceUtils.removeAspect(path, lifecycleName, > registry); > > Modified: > trunk/carbon/components/governance/org.wso2.carbon.governance.generic/src/main/java/org/wso2/carbon/governance/generic/services/ManageGenericArtifactService.java > URL: > http://wso2.org/svn/browse/wso2/trunk/carbon/components/governance/org.wso2.carbon.governance.generic/src/main/java/org/wso2/carbon/governance/generic/services/ManageGenericArtifactService.java?rev=118822&r1=118821&r2=118822&view=diff > > ============================================================================== > --- > trunk/carbon/components/governance/org.wso2.carbon.governance.generic/src/main/java/org/wso2/carbon/governance/generic/services/ManageGenericArtifactService.java > (original) > +++ > trunk/carbon/components/governance/org.wso2.carbon.governance.generic/src/main/java/org/wso2/carbon/governance/generic/services/ManageGenericArtifactService.java > Tue Jan 10 22:59:31 2012 > @@ -217,9 +217,7 @@ > } > if (lifecycleAttribute != null) { > String lifecycle = > artifact.getAttribute(lifecycleAttribute); > - if (lifecycle != null) { > - artifact.attachLifecycle(lifecycle); > - } > + artifact.attachLifecycle(lifecycle); > } > return RegistryConstants.GOVERNANCE_REGISTRY_BASE_PATH + > artifact.getPath(); > } catch (Exception e) { > _______________________________________________ > Carbon-commits mailing list > [email protected] > https://wso2.org/cgi-bin/mailman/listinfo/carbon-commits > -- *Afkham Azeez* Director of Architecture; WSO2, Inc.; http://wso2.com Member; Apache Software Foundation; http://www.apache.org/ * <http://www.apache.org/>** email: **[email protected]* <[email protected]>* cell: +94 77 3320919 blog: **http://blog.afkham.org* <http://blog.afkham.org>* twitter: **http://twitter.com/afkham_azeez*<http://twitter.com/afkham_azeez> * linked-in: **http://lk.linkedin.com/in/afkhamazeez* * * *Lean . Enterprise . Middleware*
_______________________________________________ Carbon-dev mailing list [email protected] http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev
