You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/06 21:20:28 UTC
[2/6] tomee git commit: TOMEE-2322 Still WIP,
but these failover tests pass now
TOMEE-2322 Still WIP, but these failover tests pass now
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8fbf722a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8fbf722a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8fbf722a
Branch: refs/heads/tomee-7.1.x
Commit: 8fbf722aab033c6720c5a1a34fc59164d6bf4e37
Parents: a0dba83
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Thu Dec 6 14:23:34 2018 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Thu Dec 6 20:58:08 2018 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/cli/Bootstrap.java | 8 +++++++-
.../openejb/itest/failover/RandomConnectionStrategyTest.java | 8 ++++----
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8fbf722a/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java b/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
index 88dacad..b5508a3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
@@ -178,8 +178,14 @@ public class Bootstrap {
setupHome(args);
try (final URLClassLoader loader = setupClasspath()) {
- final Class<?> clazz = (loader == null ? Bootstrap.class.getClassLoader() : loader).loadClass(OPENEJB_CLI_MAIN_CLASS_NAME);
+ if (loader != null) {
+ Thread.currentThread().setContextClassLoader(loader);
+ if (loader != ClassLoader.getSystemClassLoader()) {
+ System.setProperty("openejb.classloader.first.disallow-system-loading", "true");
+ }
+ }
+ final Class<?> clazz = (loader == null ? Bootstrap.class.getClassLoader() : loader).loadClass(OPENEJB_CLI_MAIN_CLASS_NAME);
final Object main = clazz.getConstructor().newInstance();
main.getClass().getMethod("main", String[].class).invoke(main, new Object[]{args});
} catch (final InvocationTargetException e) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/8fbf722a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
----------------------------------------------------------------------
diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
index 2f82aae..c347285 100644
--- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
+++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
@@ -88,11 +88,11 @@ public class RandomConnectionStrategyTest {
root = new StandaloneServer(home, home);
root.killOnExit();
root.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
-// root.ignoreOut();
+ root.ignoreOut();
root.setProperty("name", name);
root.setProperty("openejb.extract.configuration", "false");
- root.setDebug(true);
- root.setDebugPort(5006);
+// root.setDebug(true);
+// root.setDebugPort(5006);
final StandaloneServer.ServerService multipoint = root.getServerService("multipoint");
multipoint.setBind("localhost");
@@ -118,7 +118,7 @@ public class RandomConnectionStrategyTest {
final StandaloneServer server = new StandaloneServer(home, home);
server.killOnExit();
-// server.ignoreOut();
+ server.ignoreOut();
server.setProperty("name", name);
server.setProperty("openejb.extract.configuration", "false");
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");