svn commit: r966719 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java

[eckardjf]

Author: eckardjf
Date: Thu Jul 22 16:01:22 2010
New Revision: 966719

URL: http://svn.apache.org/viewvc?rev=966719&view=rev
Log:
base font url will always be null

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java

Modified: 
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=966719&r1=966718&r2=966719&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java 
(original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java 
Thu Jul 22 16:01:22 2010
@@ -82,11 +82,8 @@ public class ApacheFopWorker {
                     String fopPath = 
UtilProperties.getPropertyValue("fop.properties", "fop.path", ofbizHome + 
"/framework/webapp/config");
                     File userConfigFile = FileUtil.getFile(fopPath + 
"/fop.xconf");
                     fopFactory.setUserConfig(userConfigFile);
-                    String fopFontBaseUrl = 
fopFactory.getFontManager().getFontBaseURL();
-                    if (fopFontBaseUrl == null) {
-                        fopFontBaseUrl = 
UtilProperties.getPropertyValue("fop.properties", "fop.font.base.url", 
"file:///" + ofbizHome + "/framework/webapp/config/");
-                        
fopFactory.getFontManager().setFontBaseURL(fopFontBaseUrl);
-                    }
+                    String fopFontBaseUrl = 
UtilProperties.getPropertyValue("fop.properties", "fop.font.base.url", 
"file:///" + ofbizHome + "/framework/webapp/config/");
+                    fopFactory.getFontManager().setFontBaseURL(fopFontBaseUrl);
                     Debug.logInfo("FOP-FontBaseURL: " + fopFontBaseUrl, 
module);
                 } catch (Exception e) {
                     Debug.logWarning("Error reading FOP configuration", 
module);