Repository: tomee Updated Branches: refs/heads/master 38accaea4 -> eb630cab8
ensuring random port are well set in system props in tomee embedded EJBContainer Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb630cab Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb630cab Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb630cab Branch: refs/heads/master Commit: eb630cab87b30b0d8a60fc26aa3297466afe1b2f Parents: 38accae Author: Romain Manni-Bucau <rmann...@gmail.com> Authored: Thu Dec 24 17:56:56 2015 +0100 Committer: Romain Manni-Bucau <rmann...@gmail.com> Committed: Thu Dec 24 17:56:56 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/eb630cab/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java index 13ae2fb..ed300ec 100644 --- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java +++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java @@ -138,7 +138,6 @@ public final class EmbeddedTomEEContainer extends EJBContainer { } configuration.setHttpPort(port); } - System.setProperty(TOMEE_EJBCONTAINER_HTTP_PORT, Integer.toString(configuration.getHttpPort())); for (final Map.Entry<?, ?> entry : properties.entrySet()) { final Object key = entry.getKey(); @@ -152,6 +151,9 @@ public final class EmbeddedTomEEContainer extends EJBContainer { try { etc.container.start(); + // later to ensure random port are not overwritten + System.setProperty(TOMEE_EJBCONTAINER_HTTP_PORT, Integer.toString(configuration.getHttpPort())); + if (modules instanceof File) { etc.deployedIds.add(etc.container.deploy(appId, ((File) modules), appId != null).getId()); } else if (modules instanceof String) {
