From 7d46b22599c6001eaeff7f47715fa80491b3fdd5 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 14 Mar 2011 14:03:40 +0100
Subject: [PATCH] [JENKINS-7535] Rebuilding dependency graph slow on large
 installations Submitted by evernat.

---
 .../main/java/hudson/maven/MavenModule.java   | 10 ++++++----
 .../java/hudson/maven/ModuleDependency.java   | 20 ++++++++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java
index dc1cf24bc4..a19d13c792 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java
@@ -392,8 +392,9 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
 
         for (MavenModule m : Hudson.getInstance().getAllItems(MavenModule.class)) {
             if(m.isDisabled())  continue;
-            modules.put(m.asDependency(),m);
-            modules.put(m.asDependency().withUnknownVersion(),m);
+            ModuleDependency moduleDependency = m.asDependency();
+            modules.put(moduleDependency,m);
+            modules.put(moduleDependency.withUnknownVersion(),m);
         }
 
         // in case two modules with the same name is defined, modules in the same MavenModuleSet
@@ -401,8 +402,9 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
 
         for (MavenModule m : getParent().getModules()) {
             if(m.isDisabled())  continue;
-            modules.put(m.asDependency(),m);
-            modules.put(m.asDependency().withUnknownVersion(),m);
+            ModuleDependency moduleDependency = m.asDependency();
+            modules.put(moduleDependency,m);
+            modules.put(moduleDependency.withUnknownVersion(),m);
         }
 
         // if the build style is the aggregator build, define dependencies against project,
diff --git a/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
index 7924dd6ebe..050a5909a4 100644
--- a/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
+++ b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
@@ -51,8 +51,10 @@ public final class ModuleDependency implements Serializable {
     public ModuleDependency(String groupId, String artifactId, String version) {
         this.groupId = groupId.intern();
         this.artifactId = artifactId.intern();
-        if(version==null)   version=UNKNOWN;
-        this.version = version.intern();
+        if(version==null)
+            this.version = UNKNOWN;
+        else
+            this.version = version.intern();
     }
 
     public ModuleDependency(ModuleName name, String version) {
@@ -81,6 +83,15 @@ public final class ModuleDependency implements Serializable {
         this(ext.getGroupId(),ext.getArtifactId(),ext.getVersion());
     }
 
+    private ModuleDependency(String groupId, String artifactId) {
+        // to be used only by the withUnknownVersion() method
+        // where we know that groupId and artifactId are already interned
+        // and where we want an UNKNOWN version
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.version = UNKNOWN;
+    }
+    
     public ModuleName getName() {
         return new ModuleName(groupId,artifactId);
     }
@@ -89,7 +100,10 @@ public final class ModuleDependency implements Serializable {
      * Returns groupId+artifactId plus unknown version.
      */
     public ModuleDependency withUnknownVersion() {
-        return new ModuleDependency(groupId,artifactId,UNKNOWN);
+        if (UNKNOWN.equals(version))
+            return this;
+        else
+            return new ModuleDependency(groupId,artifactId);
     }
 
     public boolean equals(Object o) {
-- 
GitLab