Fixed a small bug (please see ChangeLog).

1 files changed, 33 insertions, 21 deletions

diff --git a/java/src/MessageQueue.java b/java/src/MessageQueue.java
index b13b4fdbf8d..76c60a8d933 100644
--- a/java/src/MessageQueue.java
+++ b/java/src/MessageQueue.java
@@ -462,11 +462,14 @@ public class MessageQueue
 	this.tail_ = newItem;
       }
 
-    // Make sure to count *all* the bytes in a composite message!!! 
-    for (MessageBlock temp = newItem; 
-	 temp != null; 
-	 temp = temp.cont ())
-      this.currentBytes_ += temp.size ();
+    if (item.msgType() != MessageType.MB_OBJECT)
+      {
+	// Make sure to count *all* the bytes in a composite message!!! 
+	for (MessageBlock temp = newItem; 
+	     temp != null; 
+	     temp = temp.cont ())
+	  this.currentBytes_ += temp.size ();
+      }
 
     this.currentCount_++;
     return this.currentCount_;
@@ -487,11 +490,14 @@ public class MessageQueue
 
     this.head_ = newItem;
 
-    // Make sure to count *all* the bytes in a composite message!!!
-    for (MessageBlock temp = newItem; 
-	 temp != null; 
-	 temp = temp.cont ())
-      this.currentBytes_ += temp.size ();
+    if (item.msgType() != MessageType.MB_OBJECT)
+      {
+	// Make sure to count *all* the bytes in a composite message!!!
+	for (MessageBlock temp = newItem; 
+	     temp != null; 
+	     temp = temp.cont ())
+	  this.currentBytes_ += temp.size ();
+      }
 
     this.currentCount_++;
 
@@ -544,11 +550,14 @@ public class MessageQueue
 	  }
       }
 
-    // Make sure to count *all* the bytes in a composite message!!!
-    for (MessageBlock temp = newItem; 
-	 temp != null; 
-	 temp = temp.cont ())
-      this.currentBytes_ += temp.size ();
+    if (item.msgType() != MessageType.MB_OBJECT)
+      {    
+	// Make sure to count *all* the bytes in a composite message!!!
+	for (MessageBlock temp = newItem; 
+	     temp != null; 
+	     temp = temp.cont ())
+	  this.currentBytes_ += temp.size ();
+      }
 
     this.currentCount_++;
     return this.currentCount_;
@@ -562,12 +571,15 @@ public class MessageQueue
     if (this.head_ == null)
       this.tail_ = null;
 
-    // Make sure to subtract off all of the bytes associated with this
-    // message.
-    for (MessageBlock temp = firstItem; 
-	 temp != null; 
-	 temp = temp.cont ())
-      this.currentBytes_ -= temp.size ();
+    if (item.msgType() != MessageType.MB_OBJECT)
+      {
+	// Make sure to subtract off all of the bytes associated with this
+	// message.
+	for (MessageBlock temp = firstItem; 
+	     temp != null; 
+	     temp = temp.cont ())
+	  this.currentBytes_ -= temp.size ();
+      }
 
     this.currentCount_--;
     return firstItem;