svn commit: r1625157 - in /ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service: config/model/ServiceEngine.java engine/XMLRPCClientEngine.java

Author: jleroux
Date: Mon Sep 15 20:29:17 2014
New Revision: 1625157

URL: http://svn.apache.org/r1625157
Log:
Fixes a bug introduced with r1624814. I forgot  that r1624549 has not been backported to R13.07, hence the ClassLoaderContainer.portOffset should still be used
Thanks to Adrian who warned in dev ML

Modified:
    ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java
    ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java

Modified: ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java?rev=1625157&r1=1625156&r2=1625157&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java (original)
+++ ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java Mon Sep 15 20:29:17 2014
@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.ofbiz.base.container.ClassLoaderContainer;
 import org.ofbiz.base.lang.ThreadSafe;
-import org.ofbiz.base.start.Start;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.service.config.ServiceConfigException;
 import org.w3c.dom.Element;
@@ -88,10 +88,10 @@ public final class ServiceEngine {
             List<ServiceLocation> serviceLocations = new ArrayList<ServiceLocation>(serviceLocationElementList.size());
             for (Element serviceLocationElement : serviceLocationElementList) {
                 String location = serviceLocationElement.getAttribute("location").intern();
-                if (location.contains("localhost") && Start.getInstance().getConfig().portOffset != 0) {
+                if (location.contains("localhost") && ClassLoaderContainer.portOffset != 0) {
                     String s = location.substring(location.lastIndexOf(":") + 1);
                     Integer locationPort = Integer.valueOf(s.substring(0, s.indexOf("/")));
-                    Integer port = locationPort + Start.getInstance().getConfig().portOffset;
+                    Integer port = locationPort + ClassLoaderContainer.portOffset;
                     location = location.replace(locationPort.toString(), port.toString());
                 }
                 serviceLocations.add(new ServiceLocation(serviceLocationElement, location));

Modified: ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java?rev=1625157&r1=1625156&r2=1625157&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java (original)
+++ ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java Mon Sep 15 20:29:17 2014
@@ -91,10 +91,10 @@ public class XMLRPCClientEngine extends
         String keyAlias  = null;
         try {
             url = ServiceConfigUtil.getEngineParameter(engine, "url");
-            if (Start.getInstance().getConfig().portOffset != 0) {
+            if (ClassLoaderContainer.portOffset != 0) {
                 String s = url.substring(url.lastIndexOf(":") + 1);
                 Integer rpcPort = Integer.valueOf(s.substring(0, s.indexOf("/")));
-                Integer port = rpcPort + Start.getInstance().getConfig().portOffset;
+                Integer port = rpcPort + ClassLoaderContainer.portOffset;
                 url = url.replace(rpcPort.toString(), port.toString());
             }
             login = ServiceConfigUtil.getEngineParameter(engine, "login");