commit 20f21636a37d98c5784a942a84a7bb6b66628ffa
author Hiram R. Chirino <chirino@apache.org> Tue Sep 16 18:23:45 2008 +0000
committer Hiram R. Chirino <chirino@apache.org> Tue Sep 16 18:23:45 2008 +0000
tree 73eceb95c9d007a501268e9f9b0ffe76d11f764f
parent 68f8bbd722124876fb3460a8b05a68ed8eda67d1

fixing


git-svn-id: https://svn.apache.org/repos/asf/activemq/sandbox/activemq-protobuf@695997 13f79535-47bb-0310-9956-ffa450edef68

activemq-protobuf/src/main/java/org/apache/activemq/protobuf/BaseMessage.java

diff --git a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/BaseMessage.java b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/BaseMessage.java
index a7f7734..a885bb6 100644
--- a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/BaseMessage.java
+++ b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/BaseMessage.java
@@ -94,7 +94,7 @@
         try {
             byte[] result = new byte[serializedSize()];
             CodedOutputStream output = CodedOutputStream.newInstance(result);
-            writeTo(output);
+            writePartialTo(output);
             output.checkNoSpaceLeft();
             return result;
         } catch (IOException e) {
@@ -176,14 +176,12 @@
     public T mergeFrom(InputStream input) throws IOException {
         CodedInputStream codedInput = CodedInputStream.newInstance(input);
         mergeFrom(codedInput);
-        codedInput.checkLastTagWas(0);
         return (T)this;
     }
 
     public T mergeFrom(InputStream input, ExtensionRegistry extensionRegistry) throws IOException {
         CodedInputStream codedInput = CodedInputStream.newInstance(input);
         mergeFrom(codedInput, extensionRegistry);
-        codedInput.checkLastTagWas(0);
         return (T)this;
     }