svn commit: r550437 - in /ofbiz/branches/release4.0: applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/content/src/org/ofbiz/content/content/ applications/order/src/org/ofbiz/order/shoppinglist/ framework/common/...

[lektran]

Author: lektran
Date: Mon Jun 25 02:48:18 2007
New Revision: 550437

URL: http://svn.apache.org/viewvc?view=rev&rev=550437
Log:
Applied combined fix from trunk for revisions: 550233, 550384

Modified:
    ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
    ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java
    ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
    ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/login/LoginServices.java
    ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java

Modified: ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?view=diff&rev=550437&r1=550436&r2=550437
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original)
+++ ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Mon Jun 25 02:48:18 2007
@@ -300,7 +300,7 @@
         }
 
         if (ver.equals("3.1")) {
-            if (tranKey == null && tranKey.length() <= 0) {
+            if (tranKey == null || tranKey.length() <= 0) {
                 Debug.logInfo("Trankey property required for version 3.1 reverting to 3.0",module);
                 ver = "3.0";
             }

Modified: ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java?view=diff&rev=550437&r1=550436&r2=550437
==============================================================================
--- ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java Mon Jun 25 02:48:18 2007
@@ -487,7 +487,7 @@
                     break;
                 } else {
                     Boolean isFollow = (Boolean)currentNode.get("isFollow");
-                    if (isFollow != null || isFollow.booleanValue()) {
+                    if (isFollow != null && isFollow.booleanValue()) {
                         nodeTrail.add(currentNode);
                         boolean foundPick = traverseSubContent(ctx);
                         if (foundPick) {

Modified: ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java?view=diff&rev=550437&r1=550436&r2=550437
==============================================================================
--- ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java (original)
+++ ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java Mon Jun 25 02:48:18 2007
@@ -552,7 +552,7 @@
             Debug.logError(e, module);
         }
 
-        if (surveyResp != null || surveyResp.size() > 0) {
+        if (surveyResp != null && surveyResp.size() > 0) {
             Iterator respIt = surveyResp.iterator();
             while (respIt.hasNext()) {
                 GenericValue resp = (GenericValue) respIt.next();

Modified: ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/login/LoginServices.java?view=diff&rev=550437&r1=550436&r2=550437
==============================================================================
--- ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)
+++ ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Jun 25 02:48:18 2007
@@ -545,7 +545,7 @@
 
         // security: don't create a user login if the specified partyId (if not empty) already exists
         // unless the logged in user has permission to do so (same partyId or PARTYMGR_CREATE)
-        if (partyId != null || partyId.length() > 0) {
+        if (partyId != null && partyId.length() > 0) {
             //GenericValue party = null;
             //try {
             //    party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId));

Modified: ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java?view=diff&rev=550437&r1=550436&r2=550437
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java (original)
+++ ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java Mon Jun 25 02:48:18 2007
@@ -156,8 +156,9 @@
     }
 
     public void validateSql(ModelEntity modelEntity, List conditionList) throws GenericModelException {
-        if (conditionList == null && conditionList.size() == 0)
-            throw new GenericModelException("Empty list for joining");
+        if (conditionList == null) {
+            throw new GenericModelException("Condition list is null");
+        }
         for (int i = 0; i < conditionList.size(); i++) {
             Object condObj = conditionList.get(i);
             if (!(condObj instanceof EntityCondition)) {