Author: ron.sigal(a)jboss.com Date: 2009-03-24 23:58:01 -0400 (Tue, 24 Mar 2009) New Revision: 4908 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java Log: JBREM-1102: Uses configuration when it calls MarshalFactory.getMarshaller() and MarshalFactory.getUnMarshaller(). Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java 2009-03-25 03:57:25 UTC (rev 4907) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java 2009-03-25 03:58:01 UTC (rev 4908) @@ -963,9 +963,15 @@ //TODO: -TME Need better way to get the unmarshaller (via config) + Map configMap = null; + if (invoker != null) + { + configMap = invoker.getConfiguration(); + } + if (unmarshaller == null) { - unmarshaller = MarshalFactory.getUnMarshaller(locator, classLoader); + unmarshaller = MarshalFactory.getUnMarshaller(locator, classLoader, configMap); } if (unmarshaller == null) { @@ -974,7 +980,7 @@ if (marshaller == null) { - marshaller = MarshalFactory.getMarshaller(locator, classLoader); + marshaller = MarshalFactory.getMarshaller(locator, classLoader, configMap); } if (marshaller == null) {