Repository: tomee Updated Branches: refs/heads/master 13ab7d8ba -> 05a27a5b1
TOMEE-1558 reading http port from placeholder Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/05a27a5b Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/05a27a5b Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/05a27a5b Branch: refs/heads/master Commit: 05a27a5b11dbfa6954155b6641390405e62c3dd1 Parents: 13ab7d8 Author: Romain Manni-Bucau <[email protected]> Authored: Fri Apr 24 14:51:39 2015 +0200 Committer: Romain Manni-Bucau <[email protected]> Committed: Fri Apr 24 14:51:39 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/05a27a5b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java ---------------------------------------------------------------------- diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java index 1903e45..3a61442 100644 --- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java +++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java @@ -24,6 +24,7 @@ import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.spi.ContainerSystem; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; +import org.apache.openejb.util.PropertyPlaceHolderHelper; import org.apache.webbeans.config.WebBeansContext; import java.net.InetAddress; @@ -43,7 +44,7 @@ public class OpenEJBHttpRegistry { OpenEjbConfiguration configuration = SystemInstance.get().getComponent(OpenEjbConfiguration.class); for (ServiceInfo service : configuration.facilities.services) { if (service.className.equals(HttpServerFactory.class.getName())) { - int port = Integer.parseInt(service.properties.getProperty("port")); + int port = Integer.parseInt(PropertyPlaceHolderHelper.simpleValue(service.properties.getProperty("port"))); String ip = service.properties.getProperty("bind"); if ("0.0.0.0".equals(ip)) { InetAddress[] addresses = InetAddress.getAllByName(ip);
