Author: jonesde
Date: Sat Mar  3 14:14:58 2007
New Revision: 514253

URL: http://svn.apache.org/viewvc?view=rev&rev=514253
Log:
Changed to create the service input map for the call to parseEntityXmlFile in 
the entityImportDir service for each file, rather than preparing it once and 
changing it each time; it appears that the userLogin is getting removed from 
the Map somewhere, probably by the Service Engine, which is rather bad 
actually, but this should fix it

Modified:
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java

Modified: 
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?view=diff&rev=514253&r1=514252&r2=514253
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java 
(original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java 
Sat Mar  3 14:14:58 2007
@@ -232,12 +232,6 @@
             long pauseLong = filePause != null ? filePause.longValue() : 0;
             File baseDir = new File(path);
 
-            Map parseEntityXmlFileArgs = UtilMisc.toMap("mostlyInserts", 
mostlyInserts, 
-                    "createDummyFks", createDummyFks,
-                    "maintainTimeStamps", maintainTimeStamps,
-                    "txTimeout", txTimeout,
-                    "userLogin", userLogin);
-            
             if (baseDir.isDirectory() && baseDir.canRead()) {
                 File[] fileArray = baseDir.listFiles();
                 FastList files = FastList.newInstance();
@@ -257,6 +251,12 @@
                     unprocessedFiles = FastList.newInstance();
                     Iterator filesItr = files.iterator();
                     while (filesItr.hasNext()) {
+                        Map parseEntityXmlFileArgs = 
UtilMisc.toMap("mostlyInserts", mostlyInserts, 
+                                "createDummyFks", createDummyFks,
+                                "maintainTimeStamps", maintainTimeStamps,
+                                "txTimeout", txTimeout,
+                                "userLogin", userLogin);
+                        
                         File f = (File) filesItr.next();
                         try {
                             URL furl = f.toURI().toURL();


Reply via email to