@@ -67,7 +67,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO
6767 private SearchBuilder <SnapshotDataStoreVO > searchFilteringStoreIdEqStoreRoleEqStateNeqRefCntNeq ;
6868 protected SearchBuilder <SnapshotDataStoreVO > searchFilteringStoreIdEqStateEqStoreRoleEqIdEqUpdateCountEqSnapshotIdEqVolumeIdEq ;
6969 private SearchBuilder <SnapshotDataStoreVO > stateSearch ;
70- private SearchBuilder <SnapshotDataStoreVO > idStateNeqSearch ;
70+ private SearchBuilder <SnapshotDataStoreVO > idStateNinSearch ;
7171 protected SearchBuilder <SnapshotVO > snapshotVOSearch ;
7272 private SearchBuilder <SnapshotDataStoreVO > snapshotCreatedSearch ;
7373 private SearchBuilder <SnapshotDataStoreVO > dataStoreAndInstallPathSearch ;
@@ -146,10 +146,10 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
146146 stateSearch .done ();
147147
148148
149- idStateNeqSearch = createSearchBuilder ();
150- idStateNeqSearch .and (SNAPSHOT_ID , idStateNeqSearch .entity ().getSnapshotId (), SearchCriteria .Op .EQ );
151- idStateNeqSearch .and (STATE , idStateNeqSearch .entity ().getState (), SearchCriteria .Op .NEQ );
152- idStateNeqSearch .done ();
149+ idStateNinSearch = createSearchBuilder ();
150+ idStateNinSearch .and (SNAPSHOT_ID , idStateNinSearch .entity ().getSnapshotId (), SearchCriteria .Op .EQ );
151+ idStateNinSearch .and (STATE , idStateNinSearch .entity ().getState (), SearchCriteria .Op .NOTIN );
152+ idStateNinSearch .done ();
153153
154154 snapshotVOSearch = snapshotDao .createSearchBuilder ();
155155 snapshotVOSearch .and (VOLUME_ID , snapshotVOSearch .entity ().getVolumeId (), SearchCriteria .Op .EQ );
@@ -480,15 +480,15 @@ public List<SnapshotDataStoreVO> findBySnapshotId(long snapshotId) {
480480
481481 @ Override
482482 public List <SnapshotDataStoreVO > findBySnapshotIdWithNonDestroyedState (long snapshotId ) {
483- SearchCriteria <SnapshotDataStoreVO > sc = idStateNeqSearch .create ();
483+ SearchCriteria <SnapshotDataStoreVO > sc = idStateNinSearch .create ();
484484 sc .setParameters (SNAPSHOT_ID , snapshotId );
485485 sc .setParameters (STATE , State .Destroyed .name ());
486486 return listBy (sc );
487487 }
488488
489489 @ Override
490490 public List <SnapshotDataStoreVO > findBySnapshotIdAndNotInDestroyedHiddenState (long snapshotId ) {
491- SearchCriteria <SnapshotDataStoreVO > sc = idStateNeqSearch .create ();
491+ SearchCriteria <SnapshotDataStoreVO > sc = idStateNinSearch .create ();
492492 sc .setParameters (SNAPSHOT_ID , snapshotId );
493493 sc .setParameters (STATE , State .Destroyed .name (), State .Hidden .name ());
494494 return listBy (sc );
0 commit comments