Merge pull request #1463 from ligangty/master

jdcasey · web-flow · commit 8445f27488bb · 2019-12-13T07:20:04.000-06:00
FIX: NPE happened during getAffectedBy
diff --git a/db/common/src/main/java/org/commonjava/indy/db/common/DefaultArtifactStoreQuery.java b/db/common/src/main/java/org/commonjava/indy/db/common/DefaultArtifactStoreQuery.java
@@ -433,7 +433,7 @@ public Set<Group> getGroupsAffectedBy( Collection<StoreKey> keys )
             {
                 ArtifactStore store = dataManager.getArtifactStore( key );
 
-                if ( !processed.contains( store.getKey() ) && ( store instanceof Group ) )
+                if ( ( store instanceof Group ) && !processed.contains( store.getKey() ) )
                 {
                     Group g = (Group) store;
                     if ( g.getConstituents() != null && g.getConstituents().contains( next ) )

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ public Set<Group> getGroupsAffectedBy( Collection<StoreKey> keys )`
`433`	`433`	`{`
`434`	`434`	`ArtifactStore store = dataManager.getArtifactStore( key );`
`435`	`435`
`436`		`- if ( !processed.contains( store.getKey() ) && ( store instanceof Group ) )`
	`436`	`+ if ( ( store instanceof Group ) && !processed.contains( store.getKey() ) )`
`437`	`437`	`{`
`438`	`438`	`Group g = (Group) store;`
`439`	`439`	`if ( g.getConstituents() != null && g.getConstituents().contains( next ) )`