Applied fix from trunk for revision: 965916

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release4.0@966781 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 22, 2010 · 76a68e4 · 76a68e4
1 parent c8d41f3
commit 76a68e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java b/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
@@ -108,7 +108,7 @@ public static Map entityImport(DispatchContext dctx, Map context) {
         // #############################
         // The filename to parse is prepared
         // #############################
-        if (filename != null && filename.length() > 0) {
+        if (fmfilename != null && fmfilename.lenth() > 0 && filename != null && filename.length() > 0) {
             try {
                 url = isUrl?new URL(filename):UtilURL.fromFilename(filename);
                 InputStream is = url.openStream();
@@ -125,7 +125,7 @@ public static Map entityImport(DispatchContext dctx, Map context) {
         // #############################
         // The text to parse is prepared
         // #############################
-        if (fulltext != null && fulltext.length() > 0) {
+        if (fmfilename != null && fmfilename.lenth() > 0 && fulltext != null && fulltext.length() > 0) {
             StringReader sr = new StringReader(fulltext);
             ins = new InputSource(sr);
         }