Return-Path: Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org Received: (qmail 45951 invoked from network); 16 Apr 2010 23:55:07 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Apr 2010 23:55:07 -0000 Received: (qmail 35962 invoked by uid 500); 16 Apr 2010 23:55:07 -0000 Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org Received: (qmail 35876 invoked by uid 500); 16 Apr 2010 23:55:06 -0000 Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: aries-dev@incubator.apache.org Delivered-To: mailing list aries-commits@incubator.apache.org Received: (qmail 35867 invoked by uid 99); 16 Apr 2010 23:55:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Apr 2010 23:55:06 +0000 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; Fri, 16 Apr 2010 23:55:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 280A223888EA; Fri, 16 Apr 2010 23:54:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r935098 - /incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java Date: Fri, 16 Apr 2010 23:54:43 -0000 To: aries-commits@incubator.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100416235443.280A223888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Fri Apr 16 23:54:42 2010 New Revision: 935098 URL: http://svn.apache.org/viewvc?rev=935098&view=rev Log: ARIES-287 fix a couple egregious errors in PersistenceUnitInfoImpl Modified: incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java Modified: incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java?rev=935098&r1=935097&r2=935098&view=diff ============================================================================== --- incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java (original) +++ incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java Fri Apr 16 23:54:42 2010 @@ -80,17 +80,20 @@ public class PersistenceUnitInfoImpl imp if(jarFiles != null) { for(String jarFile : jarFiles){ URL url = bundle.getResource(jarFile); - if(url == null) + if(url == null) { _logger.error("The persistence unit {} in bundle {} listed the jar file {}, but " + "{} could not be found in the bundle", new Object[]{getPersistenceUnitName(), bundle.getSymbolicName() + "_" + bundle.getVersion(), jarFile, jarFile}); + } else { + urls.add(url); + } } } return urls; } public DataSource getJtaDataSource() { - String jndiString = (String) unit.getPersistenceXmlMetadata().get(ParsedPersistenceUnit.NON_JTA_DATASOURCE); + String jndiString = (String) unit.getPersistenceXmlMetadata().get(ParsedPersistenceUnit.JTA_DATASOURCE); DataSource toReturn = null; if(jndiString != null) { try {