Author: jleroux
Date: Thu Mar 5 07:51:28 2015
New Revision: 1664244
URL:
http://svn.apache.org/r1664244Log:
Fix a bug, after r1624700 this has changed in trunk from where I backported r1663979
Modified:
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Modified: ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=1664244&r1=1664243&r2=1664244&view=diff==============================================================================
--- ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java (original)
+++ ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java Thu Mar 5 07:51:28 2015
@@ -40,8 +40,8 @@ import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
+import org.ofbiz.base.container.ClassLoaderContainer;
import org.ofbiz.base.location.FlexibleLocation;
-import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.FileUtil;
import org.ofbiz.base.util.UtilProperties;
@@ -85,7 +85,7 @@ public class ApacheFopWorker {
fopFactory.setUserConfig(userConfigFile);
URL baseUrl = new URL(fopFactory.getBaseURL());
Integer baseport = baseUrl.getPort();
- Integer port = baseport + Start.getInstance().getConfig().portOffset;
+ Integer port = baseport + ClassLoaderContainer.portOffset;
fopFactory.setBaseURL("
http://localhost:" + port);
} else {
Debug.logWarning("FOP configuration file not found: " + userConfigFile, module);