Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 97196 invoked from network); 20 Jan 2006 00:18:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Jan 2006 00:18:22 -0000 Received: (qmail 75852 invoked by uid 500); 20 Jan 2006 00:18:21 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 75841 invoked by uid 99); 20 Jan 2006 00:18:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2006 16:18:21 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 19 Jan 2006 16:18:20 -0800 Received: (qmail 96765 invoked by uid 65534); 20 Jan 2006 00:18:00 -0000 Message-ID: <20060120001800.96761.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r370679 - in /db/jdo/trunk/tck20/src/java/org/apache/jdo/tck: api/persistencemanagerfactory/ models/fieldtypes/ Date: Fri, 20 Jan 2006 00:17:58 -0000 To: jdo-commits@db.apache.org From: clr@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: clr Date: Thu Jan 19 16:17:51 2006 New Revision: 370679 URL: http://svn.apache.org/viewcvs?rev=370679&view=rev Log: JDO-281 fix JDK 1.5 issues Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java?rev=370679&r1=370678&r2=370679&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java Thu Jan 19 16:17:51 2006 @@ -174,14 +174,15 @@ GetProperty(String methodName) { this.methodName = methodName; try { - method = PersistenceManagerFactory.class.getMethod(methodName, null); + method = PersistenceManagerFactory.class.getMethod(methodName, + (Class[])null); } catch (NoSuchMethodException ex) { throw new JDOFatalInternalException("Method not defined: " + methodName); } } void execute(PersistenceManagerFactory pmf) { try { - method.invoke(pmf, null); + method.invoke(pmf, (Object[])null); } catch (IllegalAccessException ex) { throw new JDOFatalInternalException("IllegalAccessException", ex); } catch (java.lang.reflect.InvocationTargetException ex) { Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java?rev=370679&r1=370678&r2=370679&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java Thu Jan 19 16:17:51 2006 @@ -207,7 +207,8 @@ GetProperty(String methodName) { this.methodName = methodName; try { - method = PersistenceManagerFactory.class.getMethod(methodName, null); + method = PersistenceManagerFactory.class.getMethod(methodName, + (Class[])null); } catch (NoSuchMethodException ex) { throw new JDOFatalInternalException( "Method not defined: " + methodName); @@ -215,7 +216,7 @@ } void execute(PersistenceManagerFactory pmf) { try { - method.invoke(pmf, null); + method.invoke(pmf, (Object[])null); } catch (IllegalAccessException ex) { throw new JDOFatalInternalException("IllegalAccessException", ex); } catch (java.lang.reflect.InvocationTargetException ex) { Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java?rev=370679&r1=370678&r2=370679&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java Thu Jan 19 16:17:51 2006 @@ -176,7 +176,7 @@ ).equals("BigDecimal")) { for (int j = 0; j < actual.length; ++j) { BigDecimal expectedBD = (BigDecimal)expected[j]; - Object actualBD = (BigDecimal)actual[j]; + BigDecimal actualBD = (BigDecimal)actual[j]; if ((expectedBD.compareTo(actualBD) != 0)) { sbuf.append("\nFor element " + i + "[" + j + "], expected = " + expectedBD + Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java?rev=370679&r1=370678&r2=370679&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java Thu Jan 19 16:17:51 2006 @@ -171,7 +171,7 @@ for (int j = 0; j < actualL.size(); ++j) { BigDecimal bigDecCompareWith = (BigDecimal)expectedL.get(j); - Object bigDecVal = actualL.get(j); + BigDecimal bigDecVal = (BigDecimal)actualL.get(j); if ((bigDecCompareWith.compareTo(bigDecVal) != 0)) { sbuf.append("\nFor element " + i + "(" + j + "), expected = " + expected + Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java?rev=370679&r1=370678&r2=370679&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java (original) +++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java Thu Jan 19 16:17:51 2006 @@ -161,7 +161,7 @@ for (int j = 0; j < actualL.size(); ++j) { BigDecimal bigDecCompareWith = (BigDecimal)expectedL.get(j); - Object bigDecVal = actualL.get(j); + BigDecimal bigDecVal = (BigDecimal)actualL.get(j); if ((bigDecCompareWith.compareTo(bigDecVal) != 0)) { sbuf.append("\nFor element " + i + "(" + j + "), expected = " + expected +