This commit breaks the build - it will not compile. Adrian Crum Sandglass Software www.sandglass-software.com
On 9/14/2014 9:54 AM, jler...@apache.org wrote:
Author: jleroux Date: Sun Sep 14 08:54:03 2014 New Revision: 1624818 URL: http://svn.apache.org/r1624818 Log: "Applied fix from trunk for revision: 1624817 " ------------------------------------------------------------------------ r1624817 | jleroux | 2014-09-14 10:53:33 +0200 (dim. 14 sept. 2014) | 1 ligne No functional change, removes trailing blanks ------------------------------------------------------------------------ Modified: ofbiz/branches/release13.07/ (props changed) 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 Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1624817 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=1624818&r1=1624817&r2=1624818&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 Sun Sep 14 08:54:03 2014 @@ -89,8 +89,8 @@ public final class ServiceEngine { for (Element serviceLocationElement : serviceLocationElementList) { String location = serviceLocationElement.getAttribute("location").intern(); if (location.contains("localhost") && Start.getInstance().getConfig().portOffset != 0) { - String s = location.substring(location.lastIndexOf(":") + 1); - Integer locationPort = Integer.valueOf(s.substring(0, s.indexOf("/"))); + String s = location.substring(location.lastIndexOf(":") + 1); + Integer locationPort = Integer.valueOf(s.substring(0, s.indexOf("/"))); Integer port = locationPort + Start.getInstance().getConfig().portOffset; location = location.replace(locationPort.toString(), port.toString()); } 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=1624818&r1=1624817&r2=1624818&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 Sun Sep 14 08:54:03 2014 @@ -92,7 +92,7 @@ public class XMLRPCClientEngine extends try { url = ServiceConfigUtil.getEngineParameter(engine, "url"); if (Start.getInstance().getConfig().portOffset != 0) { - String s = url.substring(url.lastIndexOf(":") + 1); + String s = url.substring(url.lastIndexOf(":") + 1); Integer rpcPort = Integer.valueOf(s.substring(0, s.indexOf("/"))); Integer port = rpcPort + Start.getInstance().getConfig().portOffset; url = url.replace(rpcPort.toString(), port.toString());
