Author: jim.ma Date: 2014-02-07 18:14:25 -0500 (Fri, 07 Feb 2014) New Revision: 18323 Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/injection/WSComponent.java container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java Log: [JBWS-3670]:Only set referenc for spring integration Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/injection/WSComponent.java =================================================================== --- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/injection/WSComponent.java 2014-02-07 18:00:10 UTC (rev 18322) +++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/injection/WSComponent.java 2014-02-07 23:14:25 UTC (rev 18323) @@ -27,6 +27,7 @@ /** * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + * @author <a href="mailto:ema@redhat.com">Jim Ma</a> */ public final class WSComponent extends BasicComponent { @@ -34,7 +35,7 @@ private volatile ManagedReference reference; /** - * We can't lock on <code>this</code> because the + * We can't lock on <code>this</code> because the * {@link org.jboss.as.ee.component.BasicComponent#waitForComponentStart()} * also synchronizes on it, and calls {@link #wait()}. */ @@ -46,23 +47,22 @@ public BasicComponentInstance getComponentInstance() { if (wsComponentInstance == null) { - synchronized (lock) { - if (wsComponentInstance == null && reference == null) { - wsComponentInstance = (BasicComponentInstance) createInstance(); - } - if (wsComponentInstance == null && reference != null) { - wsComponentInstance = (BasicComponentInstance) this.createInstance(reference.getInstance()); - } - } - } - return wsComponentInstance; + synchronized (lock) { + if (wsComponentInstance == null && reference == null) { + wsComponentInstance = (BasicComponentInstance) createInstance(); + } + if (wsComponentInstance == null && reference != null) { + wsComponentInstance = (BasicComponentInstance) this.createInstance(reference.getInstance()); + } + } + } + return wsComponentInstance; } - public void setReference(ManagedReference reference) { this.reference = reference; } - + @Override public void stop() { if (wsComponentInstance == null) return; @@ -74,3 +74,4 @@ } } } + Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java =================================================================== --- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java 2014-02-07 18:00:10 UTC (rev 18322) +++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java 2014-02-07 23:14:25 UTC (rev 18323) @@ -46,6 +46,7 @@ * Invocation abstraction for all endpoint types * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + * @author <a href="mailto:ema@redhat.com">Jim Ma</a> */ abstract class AbstractInvocationHandler extends org.jboss.ws.common.invocation.AbstractInvocationHandler { @@ -102,20 +103,21 @@ // prepare for invocation onBeforeInvocation(wsInvocation); //for spring integration we don't need to go into ee's interceptors - if(wsInvocation.getInvocationContext().getTargetBean() != null) { + if(wsInvocation.getInvocationContext().getTargetBean() != null && endpoint.getProperty("SpringBus") != null) { this.reference = new ManagedReference() { - public void release() { + public void release() + { } public Object getInstance() { return wsInvocation.getInvocationContext().getTargetBean(); - } + } }; } // prepare invocation data final ComponentView componentView = getComponentView(); Component component = componentView.getComponent(); - if (reference != null && component instanceof WSComponent) { + if (component instanceof WSComponent && endpoint.getProperty("SpringBus") != null) { ((WSComponent)component).setReference(reference); } final Method method = getComponentViewMethod(wsInvocation.getJavaMethod(), componentView.getViewMethods()); @@ -123,7 +125,6 @@ prepareForInvocation(context, wsInvocation); context.setMethod(method); context.setParameters(wsInvocation.getArgs()); - context.setTarget(reference.getInstance()); context.putPrivateData(Component.class, component); context.putPrivateData(ComponentView.class, componentView); // invoke method @@ -214,3 +215,4 @@ } } +