Author: adrianc
Date: Sat Oct 4 13:38:48 2014
New Revision: 1629392
URL:
http://svn.apache.org/r1629392Log:
Merged revision(s) 1629391 from ofbiz/trunk:
Fixed a bug in GenericDelegator where stack traces were logged when a sequence name didn't match an entity name.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1629391
Modified: ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1629392&r1=1629391&r2=1629392&view=diff==============================================================================
--- ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sat Oct 4 13:38:48 2014
@@ -2347,10 +2347,12 @@ public class GenericDelegator implements
}
}
}
-
- // might be null, but will usually match the entity name
- ModelEntity seqModelEntity = this.getModelEntity(seqName);
-
+ ModelEntity seqModelEntity = null;
+ try {
+ seqModelEntity = getModelReader().getModelEntity(seqName);
+ } catch (GenericEntityException e) {
+ Debug.logInfo("Entity definition not found for sequence name " + seqName, module);
+ }
Long newSeqId = sequencer == null ? null : sequencer.getNextSeqId(seqName, staggerMax, seqModelEntity);
return newSeqId;
} catch (Exception e) {