Re: svn commit: r1791513 - /ofbiz/branches/release16.11/framework/start/src/main/java/org/apache/ofbiz /base/start/Config.java

[Jacques Le Roux <ja...@les7arts.com>]

Thanks a lot for that Taher

Jacques


Le 15/04/2017 � 16:51, taher@apache.org a �crit :
> Author: taher
> Date: Sat Apr 15 14:51:13 2017
> New Revision: 1791513
>
> URL: http://svn.apache.org/viewvc?rev=1791513&view=rev
> Log:
> Fixed: a bug related admin port blocking on contexts other than "start"
>
> This commit has reference to issue OFBIZ-9196, commit r1787627 and the
> discussion thread mentioned below. The fix was already applied for trunk
> in the above mentioned commit but cannot be ported due to incompatible
> code bases, hence the need for this commit.
>
> Hopefully this commit will end all buildbot fail messages that occur
> randomly due to port conflict on multiple running instances
>
> https://s.apache.org/xfxS
>
> Modified:
>      ofbiz/branches/release16.11/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
>
> Modified: ofbiz/branches/release16.11/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java?rev=1791513&r1=1791512&r2=1791513&view=diff
> ==============================================================================
> --- ofbiz/branches/release16.11/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java (original)
> +++ ofbiz/branches/release16.11/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java Sat Apr 15 14:51:13 2017
> @@ -225,8 +225,7 @@ public final class Config {
>           int calculatedAdminPort;
>           try {
>               calculatedAdminPort = Integer.parseInt(adminPortStr);
> -            calculatedAdminPort = calculatedAdminPort != 0 ? calculatedAdminPort : 10523; // This is necessary because the ASF machines don't allow ports 1 to 3, see  INFRA-6790
> -            calculatedAdminPort += portOffsetValue;
> +            calculatedAdminPort = calculatedAdminPort != 0 ? calculatedAdminPort + portOffsetValue : 0;
>           } catch (Exception e) {
>               System.out.println("Error while parsing admin port number (so default to 10523) = " + e);
>               calculatedAdminPort = 10523;
>
>
>