tomee git commit: by default dont trigger too early Logger init - PersistenceBootstrap fix

[rm...@apache.org]

Repository: tomee
Updated Branches:
  refs/heads/master 31e90de63 -> 61f2d2227


by default dont trigger too early Logger init - PersistenceBootstrap fix


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/61f2d222
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/61f2d222
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/61f2d222

Branch: refs/heads/master
Commit: 61f2d2227998be173ce5401c2a5b1272dc80cd3f
Parents: 31e90de
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Apr 13 16:01:06 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Apr 13 16:01:06 2015 +0200

----------------------------------------------------------------------
 .../openejb/persistence/PersistenceBootstrap.java | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/61f2d222/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
index de1a1bd..697396e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
@@ -28,11 +28,6 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.sql.DataSource;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -59,6 +54,11 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceProvider;
+import javax.sql.DataSource;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
 
 import static org.apache.openejb.loader.JarLocation.decode;
 
@@ -77,11 +77,9 @@ import static org.apache.openejb.loader.JarLocation.decode;
  */
 public class PersistenceBootstrap {
 
-    public static final Logger logger = Logger.getLogger(PersistenceBootstrap.class.getName());
-
     public static final String DEFAULT_PROVIDER = getDefaultProvider();
 
-    private static String getDefaultProvider() {
+    private static String getDefaultProvider() { // TODO: we shouldn't use a logger here, too early!
         final Class<PersistenceBootstrap> clzz = PersistenceBootstrap.class;
         final String name = "/META-INF/" + clzz.getName() + ".provider";
 
@@ -89,11 +87,11 @@ public class PersistenceBootstrap {
             final URL provider = clzz.getResource(name);
             if (provider != null) {
                 final String trim = IO.slurp(provider).trim();
-                logger.info("Default JPA Provider changed to " + trim);
+                Logger.getLogger(PersistenceBootstrap.class.getName()).info("Default JPA Provider changed to " + trim);
                 return trim;
             }
         } catch (final Exception e) {
-            logger.log(Level.WARNING, "Could not read " + name, e);
+            Logger.getLogger(PersistenceBootstrap.class.getName()).log(Level.WARNING, "Could not read " + name, e);
         }
 
         return "org.apache.openjpa.persistence.PersistenceProviderImpl";