review changes

Author: sureshanaparti

framework/db/src/main/java/com/cloud/utils/db/Filter.java

@@ -57,7 +57,7 @@ public Filter(Class<?> clazz, String field, boolean ascending) {
     }
 
     public Filter(long limit) {
-        this(limit, true);
+        this(limit, false);
     }
 
     /**
@@ -68,10 +68,8 @@ public Filter(long limit) {
     public Filter(long limit, boolean randomize) {
         if (randomize) {
             _orderBy = " ORDER BY RAND()" ;
-            _limit = limit;
-        } else {
-            _limit = limit;
         }
+        _limit = limit;
     }
 
     public Filter(Long offset, Long limit) {

framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java

@@ -1324,7 +1324,7 @@ public int batchExpunge(final SearchCriteria<T> sc, final Long batchSize) {
         Filter filter = null;
         final long batchSizeFinal = ObjectUtils.defaultIfNull(batchSize, 0L);
         if (batchSizeFinal > 0) {
-            filter = new Filter(null, batchSizeFinal);
+            filter = new Filter(batchSizeFinal);
         }
         int expunged = 0;
         int currentExpunged = 0;