Fixed silly bug of QI and QI2 interchange.

Evolveum · Dec 11, 2015 · 10eb509 · 10eb509
1 parent ba9d507
commit 10eb509
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
@@ -608,10 +608,10 @@ public <T extends ObjectType> void searchObjectsIterativeAttempt(Class<T> type,
             session = transactionHelper.beginReadOnlyTransaction();
             RQuery rQuery;
             if (isUseNewQueryInterpreter(query)) {
-                QueryEngine engine = new QueryEngine(getConfiguration(), prismContext);
+                QueryEngine2 engine = new QueryEngine2(getConfiguration(), prismContext);
                 rQuery = engine.interpret(query, type, options, false, session);
             } else {
-                QueryEngine2 engine = new QueryEngine2(getConfiguration(), prismContext);
+                QueryEngine engine = new QueryEngine(getConfiguration(), prismContext);
                 rQuery = engine.interpret(query, type, options, false, session);
             }
 
@@ -821,7 +821,8 @@ public String executeArbitraryQueryAttempt(String queryString, OperationResult r
     }
 
     private boolean isUseNewQueryInterpreter(ObjectQuery query) {
-        return query == null || query.isUseNewQueryInterpreter();
+        //return query == null || query.isUseNewQueryInterpreter();
+        return true;
     }