Author: clebert.suconic(a)jboss.com Date: 2011-03-09 09:56:52 -0500 (Wed, 09 Mar 2011) New Revision: 10309 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java Log: tweak Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-03-09 14:23:40 UTC (rev 10308) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-03-09 14:56:52 UTC (rev 10309) @@ -328,17 +328,20 @@ /* Hook for processing message before forwarding */ protected ServerMessage beforeForward(ServerMessage message) { - // We keep our own DuplicateID for the Bridge, so bouncing back and forths will work fine - byte[] bytes = new byte[24]; + if (useDuplicateDetection) + { + // We keep our own DuplicateID for the Bridge, so bouncing back and forths will work fine + byte[] bytes = new byte[24]; + + ByteBuffer bb = ByteBuffer.wrap(bytes); + + bb.put(nodeUUID.asBytes()); + + bb.putLong(message.getMessageID()); + + message.putBytesProperty(MessageImpl.HDR_BRIDGE_DUPLICATE_ID, bytes); + } - ByteBuffer bb = ByteBuffer.wrap(bytes); - - bb.put(nodeUUID.asBytes()); - - bb.putLong(message.getMessageID()); - - message.putBytesProperty(MessageImpl.HDR_BRIDGE_DUPLICATE_ID, bytes); - if (transformer != null) { message = transformer.transform(message);