#773 Unnecessary count in ModelDelegate.findOrCreateIt()

javalite · Aug 25, 2018 · 3abf690 · 3abf690
1 parent d2f7a7a
commit 3abf690
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/activejdbc/src/main/java/org/javalite/activejdbc/ModelDelegate.java b/activejdbc/src/main/java/org/javalite/activejdbc/ModelDelegate.java
@@ -454,8 +454,10 @@ public static <T extends Model> T findOrCreateIt(Class<T> clazz, boolean save, O
                 params[x++] = namesAndValues[i];
             }
         }
-        if(count(clazz, subQuery.toString(), params) > 0){
-            return findFirst(clazz, subQuery.toString(),params);
+
+        T instance = findFirst(clazz, subQuery.toString(),params);
+        if(instance != null){
+            return instance;
         } else{
 
             if(save){