svn commit: r981130 - in /ofbiz/branches/release4.0: ./ framework/entity/src/org/ofbiz/entity/GenericDelegator.java

[doogie-3]

Author: doogie
Date: Sun Aug  1 03:33:13 2010
New Revision: 981130

URL: http://svn.apache.org/viewvc?rev=981130&view=rev
Log:
Applied fix from trunk for revision: 981123
===

The database check attempted to only check each helper once; however,
the Set used to track whether a helper had been checked was *inside* the

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

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug  1 03:33:13 2010
@@ -1 +1 @@
-/ofbiz/trunk:536399,539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245,942884,943168,954956,958343,958514,965916,967098,980935
+/ofbiz/trunk:536399,539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245,942884,943168,954956,958343,958514,965916,967098,980935,981123

Modified: ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=981130&r1=981129&r2=981130&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sun Aug  1 03:33:13 2010
@@ -158,6 +158,7 @@ public class GenericDelegator implements
         }
 
         // initialize helpers by group
+        TreeSet helpersDone = new TreeSet();
         Iterator groups = UtilMisc.toIterator(getModelGroupReader().getGroupNames());
         while (groups != null && groups.hasNext()) {
             String groupName = (String) groups.next();
@@ -165,7 +166,6 @@ public class GenericDelegator implements
 
             if (Debug.infoOn()) Debug.logInfo("Delegator \"" + delegatorName + "\" initializing helper \"" +
                     helperName + "\" for entity group \"" + groupName + "\".", module);
-            TreeSet helpersDone = new TreeSet();
             if (helperName != null && helperName.length() > 0) {
                 // make sure each helper is only loaded once
                 if (helpersDone.contains(helperName)) {