Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 75317 invoked from network); 25 Nov 2008 11:26:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Nov 2008 11:26:40 -0000 Received: (qmail 66950 invoked by uid 500); 25 Nov 2008 11:26:50 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 66908 invoked by uid 500); 25 Nov 2008 11:26:49 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 66899 invoked by uid 99); 25 Nov 2008 11:26:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2008 03:26:49 -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; Tue, 25 Nov 2008 11:25:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A3C9F2388879; Tue, 25 Nov 2008 03:25:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r720468 - in /harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200: BcBands.java bytecode/forms/ReferenceForm.java Date: Tue, 25 Nov 2008 11:25:47 -0000 To: commits@harmony.apache.org From: sjanuary@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081125112547.A3C9F2388879@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sjanuary Date: Tue Nov 25 03:25:46 2008 New Revision: 720468 URL: http://svn.apache.org/viewvc?rev=720468&view=rev Log: Pack200 - minor code cleanup Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java?rev=720468&r1=720467&r2=720468&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java (original) +++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java Tue Nov 25 03:25:46 2008 @@ -355,8 +355,6 @@ bcEscRefCount); bcEscSize = decodeBandInt("bc_escsize", in, Codec.UNSIGNED5, bcEscCount); bcEscByte = decodeBandInt("bc_escbyte", in, Codec.BYTE1, bcEscSize); - - } public void unpack() throws Pack200Exception { Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java?rev=720468&r1=720467&r2=720468&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java (original) +++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java Tue Nov 25 03:25:46 2008 @@ -43,6 +43,9 @@ ClassFileEntry[] nested = null; nested = new ClassFileEntry[] { globalPool.getConstantPoolEntry( getPoolID(), offset) }; + if(nested[0] == null) { + throw new NullPointerException("Null nested entries are not allowed"); + } byteCode.setNested(nested); byteCode.setNestedPositions(new int[][] { { 0, 2 } }); }