From commits-return-10282-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Fri Feb 20 02:05:32 2009 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 38328 invoked from network); 20 Feb 2009 02:05:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Feb 2009 02:05:32 -0000 Received: (qmail 22835 invoked by uid 500); 20 Feb 2009 02:05:32 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 22816 invoked by uid 500); 20 Feb 2009 02:05:32 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 22807 invoked by uid 99); 20 Feb 2009 02:05:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Feb 2009 18:05:31 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Feb 2009 02:05:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 469862388B31; Fri, 20 Feb 2009 02:05:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r746106 - /activemq/activemq-protobuf/trunk/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java Date: Fri, 20 Feb 2009 02:05:08 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090220020509.469862388B31@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Fri Feb 20 02:05:08 2009 New Revision: 746106 URL: http://svn.apache.org/viewvc?rev=746106&view=rev Log: Fixing externizable encoding Modified: activemq/activemq-protobuf/trunk/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java Modified: activemq/activemq-protobuf/trunk/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-protobuf/trunk/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java?rev=746106&r1=746105&r2=746106&view=diff ============================================================================== --- activemq/activemq-protobuf/trunk/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java (original) +++ activemq/activemq-protobuf/trunk/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java Fri Feb 20 02:05:08 2009 @@ -22,13 +22,10 @@ import static org.apache.activemq.protobuf.WireFormat.WIRETYPE_VARINT; import static org.apache.activemq.protobuf.WireFormat.makeTag; -import java.io.DataInput; -import java.io.DataOutput; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashSet; @@ -1449,7 +1446,7 @@ if( repeated ) { p("if( bean.f_"+lname+"!=null ) {"); indent(); - p("out.writeInt(bean.f_"+lname+".size());"); + p("out.writeShort(bean.f_"+lname+".size());"); p("for(" + javaCollectionType(field) + " o : bean.f_"+lname+") {"); indent(); @@ -1475,9 +1472,10 @@ } unindent(); p("}"); + unindent(); p("} else {"); indent(); - p("out.writeInt(-1);"); + p("out.writeShort(-1);"); unindent(); p("}");