Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3C529C7C7 for ; Wed, 13 Mar 2013 19:58:51 +0000 (UTC) Received: (qmail 97207 invoked by uid 500); 13 Mar 2013 19:58:51 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 97191 invoked by uid 500); 13 Mar 2013 19:58:51 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 97184 invoked by uid 99); 13 Mar 2013 19:58:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Mar 2013 19:58:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 13 Mar 2013 19:58:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BD0FA23888E7; Wed, 13 Mar 2013 19:58:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1456111 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java Date: Wed, 13 Mar 2013 19:58:28 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130313195828.BD0FA23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhillegas Date: Wed Mar 13 19:58:28 2013 New Revision: 1456111 URL: http://svn.apache.org/r1456111 Log: DERBY-6108: Fix NPE in small device tests. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java?rev=1456111&r1=1456110&r2=1456111&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java Wed Mar 13 19:58:28 2013 @@ -180,11 +180,15 @@ public class JDBCDataSource { setBeanProperty(ds, property, value); } - ds.setLoginTimeout( TestConfiguration.getCurrent().getLoginTimeout() ); + if ( !BaseTestCase.isJ9Platform() && !BaseTestCase.isCVM() ) + { + ds.setLoginTimeout( TestConfiguration.getCurrent().getLoginTimeout() ); + } return ds; } catch (Exception e) { - BaseTestCase.fail("unexpected error", e); + BaseTestCase.printStackTrace( e ); + BaseTestCase.fail("unexpected error: " + e.getMessage(), e); return null; } }