Author: lektran
Date: Sat Oct 11 04:48:12 2014
New Revision: 1631018
URL: http://svn.apache.org/r1631018
Log:
Fix dead code warning by moving null check to the correct spot
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1631018&r1=1631017&r2=1631018&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
Sat Oct 11 04:48:12 2014
@@ -274,14 +274,15 @@ public class EntityDataLoadContainer imp
String groupNameToUse = overrideGroup != null ? overrideGroup :
entityGroupName;
Delegator delegator =
DelegatorFactory.getDelegator(delegatorNameToUse);
Delegator baseDelegator = null;
+ if (delegator == null) {
+ throw new ContainerException("Invalid delegator name!");
+ }
+
if (delegator.getDelegatorTenantId() != null) {
baseDelegator =
DelegatorFactory.getDelegator(delegator.getDelegatorBaseName());
} else {
baseDelegator = delegator;
}
- if (delegator == null) {
- throw new ContainerException("Invalid delegator name!");
- }
GenericHelperInfo helperInfo =
delegator.getGroupHelperInfo(groupNameToUse);
if (helperInfo == null) {
