svn commit: r893342 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java

[doogie-3]

Author: doogie
Date: Tue Dec 22 23:16:38 2009
New Revision: 893342

URL: http://svn.apache.org/viewvc?rev=893342&view=rev
Log:
Don't test viewEntityCondition against null multiple times.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java?rev=893342&r1=893341&r2=893342&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java Tue Dec 22 23:16:38 2009
@@ -301,17 +301,13 @@
             if (whereCondition != null) {
                 whereConditions.add(whereCondition);
             }
-        }
 
-        if (this.viewEntityCondition != null) {
             EntityCondition havingCondition = this.viewEntityCondition.getHavingCondition(modelFieldTypeReader, entityAliasStack);
             if (havingCondition != null) {
                 havingConditions.add(havingCondition);
             }
-        }
 
-        // add the current one first so it overrides the lower level ones
-        if (this.viewEntityCondition != null) {
+            // add the current one first so it overrides the lower level ones
             List<String> currentOrderByList = this.viewEntityCondition.getOrderByList();
             if (currentOrderByList != null) {
                 orderByList.addAll(currentOrderByList);