svn commit: r1639932 - in /ofbiz/branches/release12.04: ./ framework/entity/src/org/ofbiz/entity/GenericDelegator.java

Author: jleroux
Date: Sat Nov 15 22:34:50 2014
New Revision: 1639932

URL: http://svn.apache.org/r1639932
Log:
"Applied fix from trunk for revision: 1629391"
------------------------------------------------------------------------
r1629391 | adrianc | 2014-10-04 15:30:12 +0200 (sam. 04 oct. 2014) | 1 ligne

Fixed a bug in GenericDelegator where stack traces were logged when a sequence name didn't match an entity name.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1629391

Modified: ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1639932&r1=1639931&r2=1639932&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sat Nov 15 22:34:50 2014
@@ -2469,10 +2469,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;