You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/26 08:27:40 UTC
tomee git commit: http as alias for @RandomPort
Repository: tomee
Updated Branches:
refs/heads/develop cdaf95459 -> cd98a4275
http as alias for @RandomPort
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cd98a427
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cd98a427
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cd98a427
Branch: refs/heads/develop
Commit: cd98a42754076a9fa37c798d051de4e690cea1d3
Parents: cdaf954
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Dec 26 08:27:33 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Dec 26 08:27:33 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/testing/ApplicationComposers.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/cd98a427/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index 6e0001c..443f256 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -427,7 +427,8 @@ public final class ApplicationComposers {
field.setAccessible(true);
}
- final String key = field.getAnnotation(RandomPort.class).value() + ".port";
+ final String service = field.getAnnotation(RandomPort.class).value();
+ final String key = "http".equals(service) ? "httpejbd" : service + ".port";
final String existing = SystemInstance.get().getProperty(key);
final int random;
if (existing == null) {