This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new a92d6c9  Minor code improvement
a92d6c9 is described below

commit a92d6c92750629823074e68878f7f93c6225f8f6
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Oct 5 10:29:18 2022 +0200

    Minor code improvement
---
 .../org/apache/sling/feature/maven/mojos/UpdateVersionsMojo.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/UpdateVersionsMojo.java 
b/src/main/java/org/apache/sling/feature/maven/mojos/UpdateVersionsMojo.java
index 03ae5d3..ff5ce24 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/UpdateVersionsMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/UpdateVersionsMojo.java
@@ -489,8 +489,6 @@ public class UpdateVersionsMojo extends 
AbstractIncludingFeatureMojo {
             } else {
                 container = 
rawFeature.getExtensions().getByName(update.extension.getName()).getArtifacts();
             }
-            final int pos = container.indexOf(update.artifact);
-            final Artifact oldArtifact = pos == -1 ? null : container.get(pos);
             if (!container.removeExact(update.artifact.getId())) {
                 // check if property is used
                 final Artifact same = 
container.getSame(update.artifact.getId());
@@ -520,6 +518,9 @@ public class UpdateVersionsMojo extends 
AbstractIncludingFeatureMojo {
                 }
                 iter.remove();
             } else {
+                // the artifact exists in the container (removeExact returned 
true)
+                final int pos = container.indexOf(update.artifact);
+                final Artifact oldArtifact = container.get(pos);
                 final Artifact newArtifact = new 
Artifact(update.artifact.getId().changeVersion(update.newVersion));
                 newArtifact.getMetadata().putAll(oldArtifact.getMetadata());
                 container.add(pos, newArtifact);

Reply via email to