Merge branch 'master' of https://github.com/kiegroup/drools into DROO…

…LS-1676
tarilabs · Sep 7, 2017 · 8aabb54 · 8aabb54
2 parents aa542dc + 009aa42
commit 8aabb54
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/kie-ci/src/main/java/org/kie/scanner/KieRepositoryScannerImpl.java b/kie-ci/src/main/java/org/kie/scanner/KieRepositoryScannerImpl.java
@@ -68,6 +68,8 @@ public class KieRepositoryScannerImpl implements InternalKieScanner {
 
     private InternalKieContainer kieContainer;
 
+    private DependencyDescriptor kieProjectDescr;
+
     private Map<ReleaseId, DependencyDescriptor> usedDependencies;
 
     private ArtifactResolver artifactResolver;
@@ -110,6 +112,8 @@ public synchronized void setKieContainer(KieContainer kieContainer) {
         }
 
         artifactResolver = getResolverFor(this.kieContainer, true);
+        kieProjectDescr = new DependencyDescriptor(this.kieContainer.getReleaseId(),
+                                                   this.kieContainer.getCreationTimestamp());
         usedDependencies = indexArtifacts();
 
         KieScannersRegistry.register(this);
@@ -363,16 +367,19 @@ private boolean updateKieModule(DependencyDescriptor oldDependency, Artifact art
     private Map<DependencyDescriptor, Artifact> scanForUpdates() {
         artifactResolver = getResolverFor(kieContainer, true);
 
-        DependencyDescriptor currentProjectDescr = new DependencyDescriptor( this.kieContainer.getReleaseId(),
-                                                                             this.kieContainer.getCreationTimestamp());
+        if ( !kieProjectDescr.getReleaseId().equals( this.kieContainer.getReleaseId() ) ) {
+            kieProjectDescr = new DependencyDescriptor( this.kieContainer.getReleaseId(),
+                                                        this.kieContainer.getCreationTimestamp() );
+        }
 
         Map<DependencyDescriptor, Artifact> newArtifacts = new HashMap<DependencyDescriptor, Artifact>();
 
         Artifact newArtifact = artifactResolver.resolveArtifact(this.kieContainer.getConfiguredReleaseId());
         if (newArtifact != null) {
             DependencyDescriptor resolvedDep = new DependencyDescriptor(newArtifact);
-            if (resolvedDep.isNewerThan(currentProjectDescr)) {
-                newArtifacts.put(currentProjectDescr, newArtifact);
+            if (resolvedDep.isNewerThan(kieProjectDescr)) {
+                newArtifacts.put(kieProjectDescr, newArtifact);
+                kieProjectDescr = new DependencyDescriptor(newArtifact);
             }
         }