You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/02/23 02:05:25 UTC
svn commit: r1073568 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/
jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/
Author: gpetracek
Date: Wed Feb 23 01:05:24 2011
New Revision: 1073568
URL: http://svn.apache.org/viewvc?rev=1073568&view=rev
Log:
cleanup
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java?rev=1073568&r1=1073567&r2=1073568&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java Wed Feb 23 01:05:24 2011
@@ -20,9 +20,12 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
+import javax.enterprise.inject.Typed;
+
/**
* @author Gerhard Petracek
*/
+@Typed()
class DefaultLoggerFactory implements Logger.Factory
{
private static final long serialVersionUID = -4149574697548186019L;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java?rev=1073568&r1=1073567&r2=1073568&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java Wed Feb 23 01:05:24 2011
@@ -63,7 +63,7 @@ public class DefaultTransactionalInterce
private static transient ThreadLocal<AtomicInteger> refCount = new ThreadLocal<AtomicInteger>();
- private final Logger logger = Logger.getLogger(TransactionalInterceptor.class.getName());
+ private transient Logger logger;
/** key=qualifier name, value= EntityManager */
private static transient ThreadLocal<HashMap<String, EntityManager>> entityManagerMap =
@@ -217,7 +217,7 @@ public class DefaultTransactionalInterce
}
catch (Exception eRollback)
{
- logger.log(Level.SEVERE, "Got additional Exception while subsequently " +
+ getLogger().log(Level.SEVERE, "Got additional Exception while subsequently " +
"rolling back other SQL transactions", eRollback);
}
@@ -417,6 +417,15 @@ public class DefaultTransactionalInterce
"(-> different qualifiers) within ONE intercepted method isn't supported.");
}
+ protected Logger getLogger()
+ {
+ if(logger == null)
+ {
+ logger = Logger.getLogger(getClass().getName());
+ }
+ return logger;
+ }
+
@SuppressWarnings({"UnusedDeclaration"})
private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
{