Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 8604 invoked from network); 23 Aug 2006 06:32:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Aug 2006 06:32:43 -0000 Received: (qmail 81780 invoked by uid 500); 23 Aug 2006 06:32:42 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 81745 invoked by uid 500); 23 Aug 2006 06:32:42 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 81734 invoked by uid 99); 23 Aug 2006 06:32:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2006 23:32:42 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2006 23:32:42 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E55C21A981C; Tue, 22 Aug 2006 23:32:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r433936 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/io/ObjectInputStream.java test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java Date: Wed, 23 Aug 2006 06:32:21 -0000 To: harmony-commits@incubator.apache.org From: pyang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060823063221.E55C21A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pyang Date: Tue Aug 22 23:32:20 2006 New Revision: 433936 URL: http://svn.apache.org/viewvc?rev=433936&view=rev Log: Patch applied for HARMONY-1256 ([classlib][io] ObjectInputStream.readClassDescriptor() throws NotActiveException while RI throws NPE) Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java?rev=433936&r1=433935&r2=433936&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java Tue Aug 22 23:32:20 2006 @@ -1710,9 +1710,6 @@ */ protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException { - if (descriptorHandle == null) { - throw new NotActiveException(); - } ObjectStreamClass newClassDesc = new ObjectStreamClass(); newClassDesc.setName(input.readUTF()); Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java?rev=433936&r1=433935&r2=433936&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java Tue Aug 22 23:32:20 2006 @@ -90,6 +90,27 @@ list.add(this); } } + + class OIS extends ObjectInputStream { + + OIS () throws IOException { + super(); + } + + void test() throws ClassNotFoundException,IOException { + readClassDescriptor(); + } + + } + + public void test_readClassDescriptor() throws ClassNotFoundException,IOException { + try { + new OIS().test(); + } catch (NullPointerException e) { + // expected + } + } + }