svn commit: r966781 - in /ofbiz/branches/release4.0: ./ framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java

[doogie-3]

Author: doogie
Date: Thu Jul 22 18:20:38 2010
New Revision: 966781

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

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

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 18:20:38 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
+/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,965916

Modified: ofbiz/branches/release4.0/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=966781&r1=966780&r2=966781&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original)
+++ ofbiz/branches/release4.0/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Thu Jul 22 18:20:38 2010
@@ -108,7 +108,7 @@ public class WebToolsServices {
         // #############################
         // 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 class WebToolsServices {
         // #############################
         // 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);
         }