[hornetq-commits] JBoss hornetq SVN: r11290 - in branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core: protocol/core/impl/wireformat and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Sep 1 20:30:15 EDT 2011
Author: clebert.suconic at jboss.com
Date: 2011-09-01 20:30:14 -0400 (Thu, 01 Sep 2011)
New Revision: 11290
Modified:
branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java
branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java
Log:
fixing a merge problem
Modified: branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java
===================================================================
--- branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java 2011-09-02 00:29:38 UTC (rev 11289)
+++ branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java 2011-09-02 00:30:14 UTC (rev 11290)
@@ -287,8 +287,6 @@
@Override
public synchronized ServerMessage copy()
{
- incrementDelayDeletionCount();
-
long idToUse = messageID;
if (linkMessage != null)
Modified: branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java
===================================================================
--- branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java 2011-09-02 00:29:38 UTC (rev 11289)
+++ branches/one-offs/Hornetq_2_2_5_EAP_JBPAPP_7116/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java 2011-09-02 00:30:14 UTC (rev 11290)
@@ -61,6 +61,7 @@
{
super(PacketImpl.SESS_SEND_CONTINUATION, body, continues);
this.requiresResponse = requiresResponse;
+ this.message = message;
}
/**
More information about the hornetq-commits
mailing list