svn commit: r895742 - /ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyTypeHelper.java

Author: jleroux
Date: Mon Jan  4 18:38:09 2010
New Revision: 895742

URL: http://svn.apache.org/viewvc?rev=895742&view=rev
Log:
Check for an NPE in case the partyId is not a valid partyId

Modified:
    ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyTypeHelper.java

Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyTypeHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyTypeHelper.java?rev=895742&r1=895741&r2=895742&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyTypeHelper.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyTypeHelper.java Mon Jan  4 18:38:09 2010
@@ -21,6 +21,7 @@
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -45,11 +46,14 @@
         GenericValue checkedTypeOfParty = null;
         try {
             party = delegator.findOne("Party", UtilMisc.toMap("partyId", partyId), false);
-            partyType = party.getRelatedOneCache("PartyType");
-            checkedTypeOfParty = delegator.findOne("PartyType", UtilMisc.toMap("partyTypeId", checkedPartyType), true);
+            if (UtilValidate.isNotEmpty(party)) {
+                partyType = party.getRelatedOneCache("PartyType");
+                checkedTypeOfParty = delegator.findOne("PartyType", UtilMisc.toMap("partyTypeId", checkedPartyType), true);
+            } else {
+                return false;
+            }
         } catch (GenericEntityException e) {
-            Debug.logWarning(e, module);
-            return false;
+            Debug.logWarning(e, module);            
         }    
         return EntityTypeUtil.isType(partyType, checkedTypeOfParty);
     }