Author: asoldano Date: 2014-02-12 09:11:48 -0500 (Wed, 12 Feb 2014) New Revision: 18341 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java Log: [JBPAPP-10655] Fixing FastInfoset regression + adding some @Override annotation to prevent similar problems in the future Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2014-02-12 13:18:39 UTC (rev 18340) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2014-02-12 14:11:48 UTC (rev 18341) @@ -40,11 +40,13 @@ */ public class FastInfosetConnectionHTTP extends SOAPProtocolConnectionHTTP { - public UnMarshaller getUnmarshaller() + @Override + public UnMarshaller getUnmarshaller(boolean oneway) { return new FastInfosetUnMarshaller(); } + @Override public Marshaller getMarshaller() { return new FastInfosetMarshaller(); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java 2014-02-12 13:18:39 UTC (rev 18340) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java 2014-02-12 14:11:48 UTC (rev 18341) @@ -31,11 +31,13 @@ */ public class HTTPProtocolConnection extends HTTPRemotingConnection { + @Override public UnMarshaller getUnmarshaller(boolean oneway) { return new HTTPMessageUnMarshaller(); } + @Override public Marshaller getMarshaller() { return new HTTPMessageMarshaller(); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2014-02-12 13:18:39 UTC (rev 18340) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2014-02-12 14:11:48 UTC (rev 18341) @@ -41,11 +41,13 @@ */ public class JsonConnectionHTTP extends HTTPRemotingConnection { + @Override public UnMarshaller getUnmarshaller(boolean oneway) { return new JsonMessageUnMarshaller(); } + @Override public Marshaller getMarshaller() { return new JsonMessageMarshaller(); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2014-02-12 13:18:39 UTC (rev 18340) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2014-02-12 14:11:48 UTC (rev 18341) @@ -46,6 +46,7 @@ */ public class SOAPProtocolConnectionHTTP extends HTTPRemotingConnection { + @Override public UnMarshaller getUnmarshaller(boolean oneway) { if(oneway) @@ -54,11 +55,13 @@ return new SOAPMessageUnMarshallerHTTP(); } + @Override public Marshaller getMarshaller() { return new SOAPMessageMarshaller(); } + @Override public MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway) throws IOException { try @@ -82,6 +85,7 @@ } } + @Override protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata) { super.populateHeaders(reqMessage, metadata);