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

[jleroux]

Author: jleroux
Date: Fri May  1 12:08:59 2015
New Revision: 1677123

URL: http://svn.apache.org/r1677123
Log:
Fixes the way the FOP baseUrl was set. This was due to a change introduced for 
"Allow FOP to support <fo:external-graphic></fo:external> for -Dportoffset" at 
https://issues.apache.org/jira/browse/OFBIZ-6120

Thanks to Deepak's report

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=1677123&r1=1677122&r2=1677123&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 
Fri May  1 12:08:59 2015
@@ -84,9 +84,11 @@ public class ApacheFopWorker {
                     if (userConfigFile.exists()) {
                         fopFactory.setUserConfig(userConfigFile);
                         URL baseUrl = new URL(fopFactory.getBaseURL());
+                        String protocol = baseUrl.getProtocol();
+                        String host = baseUrl.getHost();
                         Integer baseport = baseUrl.getPort();
                         Integer port = baseport + 
Start.getInstance().getConfig().portOffset;
-                        fopFactory.setBaseURL("http://localhost:"; + port);
+                        fopFactory.setBaseURL(protocol + "://" + host + ":" + 
port);
                     } else {
                         Debug.logWarning("FOP configuration file not found: " 
+ userConfigFile, module);
                     }