Author: alessio.soldano(a)jboss.com Date: 2009-03-24 07:26:26 -0400 (Tue, 24 Mar 2009) New Revision: 9673 Modified: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java Log: [JBWS-2555] Misc minor fixes Modified: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java =================================================================== --- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java 2009-03-24 11:25:39 UTC (rev 9672) +++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java 2009-03-24 11:26:26 UTC (rev 9673) @@ -37,6 +37,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceRef; import javax.xml.ws.WebServiceRefs; @@ -173,6 +174,8 @@ declaringClass = ((Method)anElement).getDeclaringClass(); else if (anElement instanceof Class) declaringClass = (Class)anElement; + else + throw new WebServiceException("Unsupported anElement: " + anElement); handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; } Modified: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java =================================================================== --- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java 2009-03-24 11:25:39 UTC (rev 9672) +++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java 2009-03-24 11:26:26 UTC (rev 9673) @@ -21,16 +21,15 @@ */ package org.jboss.wsf.stack.metro.tools; -import org.jboss.wsf.spi.tools.WSContractProvider; -import org.apache.tools.ant.taskdefs.Classloader; - import java.io.File; import java.io.PrintStream; -import java.util.List; -import java.util.ArrayList; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; +import org.jboss.wsf.spi.tools.WSContractProvider; + import com.sun.tools.ws.wscompile.WsgenTool; /** Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java =================================================================== --- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2009-03-24 11:25:39 UTC (rev 9672) +++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2009-03-24 11:26:26 UTC (rev 9673) @@ -108,7 +108,7 @@ { MessageStreamAdapter adapter = endpoint.getAttachment(MessageStreamAdapter.class); if (adapter == null) - throw new IllegalStateException("Cannot obtain: " + adapter.getClass().getName()); + throw new IllegalStateException("Cannot obtain: " + adapter); try { @@ -238,10 +238,9 @@ */ private static void copyProperties(InvocationContext invCtx, MessageStreamContext msgCtx) { - boolean invCtxAvailable = (invCtx != null); - boolean invCtxHasProps = (invCtx.getAttachment(Properties.class) != null); + boolean invCtxHasProps = (invCtx != null) && (invCtx.getAttachment(Properties.class) != null); - if (invCtxAvailable && invCtxHasProps) + if (invCtxHasProps) { Map<String, String> msgReqCtx = msgCtx.getRequestContext(); Properties invCtxProps = invCtx.getAttachment(Properties.class);