Skip to content

Commit c4d214e

Browse files
authored
Merge pull request #2183 from ligangty/2.7.x
Fix: concrete in group store query missing enabled parameter
2 parents a0a9a9d + b112960 commit c4d214e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

db/common/src/main/java/org/commonjava/indy/db/common/DefaultArtifactStoreQuery.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ private List<ArtifactStore> getMembersOrdering(final Group groupRepo, final Bool
557557
final boolean includeGroups, final boolean recurseGroups) throws IndyDataException
558558
{
559559

560-
if ( groupRepo == null || groupRepo.isDisabled() && Boolean.TRUE.equals(this.enabled) )
560+
if ( groupRepo == null || groupRepo.isDisabled() && enabled )
561561
{
562562
return result;
563563
}
@@ -588,7 +588,7 @@ private List<ArtifactStore> getMembersOrdering(final Group groupRepo, final Bool
588588
else
589589
{
590590
final ArtifactStore store = dataManager.getArtifactStore( key );
591-
if (store != null && !(store.isDisabled() && Boolean.TRUE.equals( this.enabled )))
591+
if ( store != null && ( store.isDisabled() != enabled ) )
592592
{
593593
result.add( store );
594594
}

0 commit comments

Comments
 (0)