Author: richard.opalka(a)jboss.com Date: 2009-04-03 07:24:18 -0400 (Fri, 03 Apr 2009) New Revision: 9714 Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java Log: [JBWS-2074] exclude WebServiceContext from @Resource injection Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java 2009-04-03 11:22:21 UTC (rev 9713) +++ common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java 2009-04-03 11:24:18 UTC (rev 9714) @@ -22,8 +22,10 @@ package org.jboss.wsf.common.javax.finders; import java.lang.reflect.Field; +import java.lang.reflect.Method; import javax.annotation.Resource; +import javax.xml.ws.WebServiceContext; import org.jboss.wsf.common.reflection.AnnotatedFieldFinder; @@ -65,4 +67,16 @@ ReflectionUtils.assertNotPrimitiveType(field, annotation); } + @Override + public boolean matches(Field field) + { + if (super.matches(field)) + { + // don't match @Resource annotated fields of type WebServiceContext + return !field.getType().equals(WebServiceContext.class); + } + + return false; + } + } Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java 2009-04-03 11:22:21 UTC (rev 9713) +++ common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java 2009-04-03 11:24:18 UTC (rev 9714) @@ -24,6 +24,7 @@ import java.lang.reflect.Method; import javax.annotation.Resource; +import javax.xml.ws.WebServiceContext; import org.jboss.wsf.common.reflection.AnnotatedMethodFinder; @@ -68,4 +69,16 @@ ReflectionUtils.assertNotStatic(method, annotation); } + @Override + public boolean matches(Method method) + { + if (super.matches(method)) + { + // don't match @Resource annotated methods accepting WebServiceContext parameter + return !method.getParameterTypes()[0].equals(WebServiceContext.class); + } + + return false; + } + }