Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 70692 invoked from network); 18 Apr 2008 11:00:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Apr 2008 11:00:20 -0000 Received: (qmail 42161 invoked by uid 500); 18 Apr 2008 11:00:21 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 42145 invoked by uid 500); 18 Apr 2008 11:00:20 -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 42136 invoked by uid 99); 18 Apr 2008 11:00:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Apr 2008 04:00:20 -0700 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Apr 2008 10:59:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EC8EF1A9832; Fri, 18 Apr 2008 03:59:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r649459 - in /harmony/enhanced/classlib/trunk/modules/misc/src/main: java/org/apache/harmony/misc/accessors/ObjectAccessor.java native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessorImpl.c Date: Fri, 18 Apr 2008 10:59:56 -0000 To: commits@harmony.apache.org From: tonywu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080418105958.EC8EF1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tonywu Date: Fri Apr 18 03:59:44 2008 New Revision: 649459 URL: http://svn.apache.org/viewvc?rev=649459&view=rev Log: Apply patch for HARMONY-5756 ([classlib][luni][performance] ObjectInputStream must use accessors for instantiating objects) Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/java/org/apache/harmony/misc/accessors/ObjectAccessor.java harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessorImpl.c Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/java/org/apache/harmony/misc/accessors/ObjectAccessor.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/java/org/apache/harmony/misc/accessors/ObjectAccessor.java?rev=649459&r1=649458&r2=649459&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/misc/src/main/java/org/apache/harmony/misc/accessors/ObjectAccessor.java (original) +++ harmony/enhanced/classlib/trunk/modules/misc/src/main/java/org/apache/harmony/misc/accessors/ObjectAccessor.java Fri Apr 18 03:59:44 2008 @@ -64,7 +64,7 @@ * This class complies to singleton pattern. */ private static ObjectAccessor instance; - static ObjectAccessor getInstance() { + public static ObjectAccessor getInstance() { if (instance == null) { System.loadLibrary("accessors"); //$NON-NLS-1$ instance = new ObjectAccessor(); Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessorImpl.c URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessorImpl.c?rev=649459&r1=649458&r2=649459&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessorImpl.c (original) +++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessorImpl.c Fri Apr 18 03:59:44 2008 @@ -307,8 +307,13 @@ */ JNIEXPORT jobject JNICALL Java_org_apache_harmony_misc_accessors_ObjectAccessor_newInstance__Ljava_lang_Class_2J_3Ljava_lang_Object_2 (JNIEnv *env, jobject accessorObj, jclass clss, jlong ctorID, jobjectArray args) { - jvalue* pargs = jarrayToValues(env, args); - jobject res = (*env)->NewObjectA(env, clss, (jmethodID)(intptr_t)ctorID, pargs); + jvalue *pargs = NULL; + jobject res; + + if (args != NULL) { + pargs = jarrayToValues(env, args); + } + res = (*env)->NewObjectA(env, clss, (jmethodID)(intptr_t)ctorID, pargs); free(pargs); return res; }