Author: ron.sigal(a)jboss.com Date: 2009-04-04 00:40:18 -0400 (Sat, 04 Apr 2009) New Revision: 4923 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java Log: JBREM-1102: getMarshaller() and getUnMarshaller() can look in configuration map as well as InvokerLocator. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2009-04-04 04:37:08 UTC (rev 4922) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2009-04-04 04:40:18 UTC (rev 4923) @@ -72,7 +72,7 @@ if (marshaller == null) { // try by locator (in case marshaller class name specified) - marshaller = MarshalFactory.getMarshaller(getLocator(), getClassLoader()); + marshaller = MarshalFactory.getMarshaller(getLocator(), getClassLoader(), configuration); if (marshaller == null) { // need to have a marshaller, so create a default one @@ -103,7 +103,7 @@ } // try by locator (in case unmarshaller class name specified) - unmarshaller = MarshalFactory.getUnMarshaller(getLocator(), getClassLoader()); + unmarshaller = MarshalFactory.getUnMarshaller(getLocator(), getClassLoader(), configuration); if (unmarshaller == null) { unmarshaller = MarshalFactory.getUnMarshaller(getDataType(), getSerializationType()); @@ -465,11 +465,12 @@ { if (dataType == null) { - dataType = getDataType(getLocator()); - if (dataType == null) + String localDataType = getDataType(getLocator()); + if (localDataType == null) { - dataType = getDefaultDataType(); + localDataType = getDefaultDataType(); } + dataType = localDataType; } return dataType; }