You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/11/23 15:15:06 UTC
[08/25] tomee git commit: Comment out until resolved
Comment out until resolved
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2ddef77f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2ddef77f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2ddef77f
Branch: refs/heads/tomee-1.7.3-prepare
Commit: 2ddef77f3cb08c0d3d713c25f316c02640898352
Parents: 8937e53
Author: AndyGee <an...@gmx.de>
Authored: Thu Nov 19 11:08:55 2015 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Nov 19 11:08:55 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/InjectionProcessor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2ddef77f/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java b/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
index 5c64757..5bc6e90 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
@@ -20,7 +20,6 @@ package org.apache.openejb;
import org.apache.openejb.core.ivm.naming.JndiUrlReference;
import org.apache.openejb.injection.FallbackPropertyInjector;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.resource.activemq.ConnectionFactoryWrapper;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -30,6 +29,8 @@ import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
import javax.jms.ConnectionFactory;
+import javax.jms.QueueConnection;
+import javax.jms.TopicConnection;
import javax.naming.Context;
import javax.naming.NamingException;
import java.lang.reflect.InvocationTargetException;
@@ -251,9 +252,9 @@ public class InjectionProcessor<T> {
if (value != null) {
- if(ConnectionFactory.class.isInstance(value)){
+ if(ConnectionFactory.class.isInstance(value) && !TopicConnection.class.isInstance(value) && !QueueConnection.class.isInstance(value)){
//Wrap
- value = new ConnectionFactoryWrapper(ConnectionFactory.class.cast(value));
+ //value = new ConnectionFactoryWrapper(ConnectionFactory.class.cast(value));
}
final String prefix;