Author: jacopoc
Date: Sun Mar 18 03:52:21 2007
New Revision: 519589
URL:
http://svn.apache.org/viewvc?view=rev&rev=519589Log:
Applied slightly (different patch) from Stefan Huehner to fix wrong npe check. OFBIZ-776
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?view=diff&rev=519589&r1=519588&r2=519589==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java Sun Mar 18 03:52:21 2007
@@ -317,8 +317,8 @@
public ModelField getAliasedField(ModelEntity aliasedEntity, String field, ModelReader modelReader) {
ModelField aliasedField = aliasedEntity.getField(field);
- if (aliasedEntity == null) {
- Debug.logError("[ModelViewEntity.populateFields] ERROR: could not find ModelEntity for entity name: " + aliasedEntity.getEntityName(), module);
+ if (aliasedField == null) {
+ Debug.logError("[ModelViewEntity.populateFields] ERROR: could not find ModelField for entity name: " + aliasedEntity.getEntityName() + " and field: " + field, module);
return null;
}
return aliasedField;