You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/10/07 08:07:48 UTC
svn commit: r1629806 -
/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
Author: cziegeler
Date: Tue Oct 7 06:07:47 2014
New Revision: 1629806
URL: http://svn.apache.org/r1629806
Log:
Remove artifact on merge regardless of the start level
Modified:
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java?rev=1629806&r1=1629805&r2=1629806&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java Tue Oct 7 06:07:47 2014
@@ -56,9 +56,11 @@ public abstract class ModelUtility {
final ArtifactGroup baseGroup = baseRunMode.getOrCreateArtifactGroup(group.getStartLevel());
for(final Artifact artifact : group) {
- final Artifact found = baseGroup.search(artifact);
- if ( found != null ) {
- baseGroup.remove(found);
+ for(final ArtifactGroup searchGroup : baseRunMode.getArtifactGroups()) {
+ final Artifact found = baseGroup.search(artifact);
+ if ( found != null ) {
+ searchGroup.remove(found);
+ }
}
baseGroup.add(artifact);
}