incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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 {



Mime
View raw message