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 2016/03/15 22:00:48 UTC
tomee git commit: ensuring SystemInstance doesnt leak for
EarModuleNamesTest
Repository: tomee
Updated Branches:
refs/heads/master 6225b2e99 -> 97b3ea49e
ensuring SystemInstance doesnt leak for EarModuleNamesTest
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/97b3ea49
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/97b3ea49
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/97b3ea49
Branch: refs/heads/master
Commit: 97b3ea49eb65f97e633b61a839d357962413f2ff
Parents: 6225b2e
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Mar 15 22:00:30 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Mar 15 22:00:30 2016 +0100
----------------------------------------------------------------------
.../org/apache/openejb/config/BuiltInEnvironmentEntries.java | 4 +++-
.../test/java/org/apache/openejb/config/EarModuleNamesTest.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/97b3ea49/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java b/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
index d5c9d20..f664544 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
@@ -95,8 +95,10 @@ public class BuiltInEnvironmentEntries implements DynamicDeployer {
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedScheduledExecutorService").type(ManagedScheduledExecutorService.class));
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedThreadFactory").type(ManagedThreadFactory.class));
try {
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ contextClassLoader.loadClass("org.apache.activemq.ActiveMQSslConnectionFactory");
final ResourceEnvRef ref = new ResourceEnvRef().name("java:comp/DefaultJMSConnectionFactory")
- .type(Thread.currentThread().getContextClassLoader().loadClass("javax.jms.ConnectionFactory"));
+ .type(contextClassLoader.loadClass("javax.jms.ConnectionFactory"));
add(jndi.getResourceEnvRefMap(), ref);
} catch (final ClassNotFoundException | NoClassDefFoundError notThere) {
// no-op
http://git-wip-us.apache.org/repos/asf/tomee/blob/97b3ea49/container/openejb-core/src/test/java/org/apache/openejb/config/EarModuleNamesTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/EarModuleNamesTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/EarModuleNamesTest.java
index f6bc86f..eadab2f 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/EarModuleNamesTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/EarModuleNamesTest.java
@@ -19,9 +19,9 @@ package org.apache.openejb.config;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.loader.Files;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.Archives;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,11 +39,13 @@ public class EarModuleNamesTest {
@BeforeClass
public static void preventDefaults() {
System.setProperty("openejb.environment.default", "false");
+ SystemInstance.reset();
}
@AfterClass
public static void reset() {
System.clearProperty("openejb.environment.default");
+ SystemInstance.reset();
}
@Test