svn commit: r1225925 - /myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java

[gp...@apache.org]

Author: gpetracek
Date: Fri Dec 30 21:28:11 2011
New Revision: 1225925

URL: http://svn.apache.org/viewvc?rev=1225925&view=rev
Log:
EXTCDI-254 cleanup

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.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/PersistenceHelper.java?rev=1225925&r1=1225924&r2=1225925&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java Fri Dec 30 21:28:11 2011
@@ -37,12 +37,11 @@ import java.util.concurrent.ConcurrentHa
 @Typed()
 public class PersistenceHelper
 {
-    //don't use final in interceptors
-    private static String noFieldMarker = PersistenceHelper.class.getName() + ":DEFAULT_FIELD";
+    private static final String NO_FIELD_MARKER = PersistenceHelper.class.getName() + ":DEFAULT_FIELD";
 
     private static transient volatile Map<ClassLoader, Map<String, PersistenceContextMetaEntry>>
             persistenceContextMetaEntries =
-            new ConcurrentHashMap<ClassLoader, Map<String, PersistenceContextMetaEntry>>();
+                new ConcurrentHashMap<ClassLoader, Map<String, PersistenceContextMetaEntry>>();
 
     private PersistenceHelper()
     {
@@ -67,8 +66,8 @@ public class PersistenceHelper
     }
 
     /*
-    * needed for special add-ons - don't change it!
-    */
+     * needed for special add-ons - don't change it!
+     */
     static EntityManagerEntry tryToFindEntityManagerEntryInTarget(Object target)
     {
         Map<String, PersistenceContextMetaEntry> mapping = persistenceContextMetaEntries.get(getClassLoader());
@@ -78,7 +77,7 @@ public class PersistenceHelper
         String key = target.getClass().getName();
         PersistenceContextMetaEntry persistenceContextEntry = mapping.get(key);
 
-        if( persistenceContextEntry != null && noFieldMarker.equals(persistenceContextEntry.getFieldName()))
+        if( persistenceContextEntry != null && NO_FIELD_MARKER.equals(persistenceContextEntry.getFieldName()))
         {
             return null;
         }
@@ -90,7 +89,7 @@ public class PersistenceHelper
             if(persistenceContextEntry == null)
             {
                 mapping.put(key, new PersistenceContextMetaEntry(
-                        Object.class, noFieldMarker, Default.class.getName(), false));
+                        Object.class, NO_FIELD_MARKER, Default.class.getName(), false));
                 return null;
             }