Repository: tomee Updated Branches: refs/heads/master 86dd33c77 -> 26ac4e346
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/26ac4e34 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/26ac4e34 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/26ac4e34 Branch: refs/heads/master Commit: 26ac4e34658ac57e124ae5905e11e4b486bcc1c9 Parents: 86dd33c Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Fri Apr 24 15:03:23 2015 +0200 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Fri Apr 24 15:03:23 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/server/ServiceDaemon.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/26ac4e34/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java index 498ebf1..cd291b5 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java @@ -21,11 +21,9 @@ import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.monitoring.Managed; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; +import org.apache.openejb.util.PropertyPlaceHolderHelper; import org.apache.openejb.util.StringTemplate; -import javax.net.ServerSocketFactory; -import javax.net.ssl.SSLServerSocket; -import javax.net.ssl.SSLServerSocketFactory; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -45,6 +43,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import javax.net.ServerSocketFactory; +import javax.net.ssl.SSLServerSocket; +import javax.net.ssl.SSLServerSocketFactory; @SuppressWarnings("UnusedDeclaration") @Managed @@ -110,13 +111,13 @@ public class ServiceDaemon implements ServerService { this.discoveryUriFormat = new StringTemplate(formatString); } - this.ip = props.getProperty("bind"); + this.ip = PropertyPlaceHolderHelper.simpleValue(props.getProperty("bind")); this.inetAddress = getAddress(this.ip); final Options options = new Options(props); - this.port = options.get("port", 0); + this.port = Integer.parseInt(PropertyPlaceHolderHelper.simpleValue(options.get("port", "0"))); final int threads = options.get("threads", 100);
