Author: manik.surtani(a)jboss.com Date: 2008-09-16 06:13:14 -0400 (Tue, 16 Sep 2008) New Revision: 6729 Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java Log: Updated to make it JGroups 2.6.4-friendly Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java =================================================================== --- core/branches/2.2.X/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-09-15 16:13:06 UTC (rev 6728) +++ core/branches/2.2.X/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-09-16 10:13:14 UTC (rev 6729) @@ -85,7 +85,7 @@ byte[] buf; try { - buf = req_marshaller.objectToByteBuffer(command); + buf = getRequestMarshaller().objectToByteBuffer(command); } catch (Exception e) { @@ -131,7 +131,7 @@ { try { - return executeCommand((ReplicableCommand) req_marshaller.objectFromByteBuffer(req.getBuffer()), req); + return executeCommand((ReplicableCommand) getRequestMarshaller().objectFromByteBuffer(req.getBuffer()), req); } catch (Throwable x) { @@ -178,6 +178,6 @@ @Override public String toString() { - return getClass().getSimpleName() + "[Outgoing marshaller: " + req_marshaller + "; incoming marshaller: " + rsp_marshaller + "]"; + return getClass().getSimpleName() + "[Outgoing marshaller: " + getRequestMarshaller() + "; incoming marshaller: " + getResponseMarshaller() + "]"; } }