From 399365eb36176c2231b3f6488600fa28da17033f Mon Sep 17 00:00:00 2001 From: "David E. Jones" Date: Sat, 3 Mar 2007 22:14:58 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@514253 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/org/ofbiz/webtools/WebToolsServices.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java b/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java index 18c114d941..d488c4cc0f 100644 --- a/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java +++ b/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java @@ -232,12 +232,6 @@ public class WebToolsServices { 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 @@ public class WebToolsServices { 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();