This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch dev/2.0.0-M2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit fa1111340f3ccda0b14c8bac88e61de5f1e51ace
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Fri Jan 5 14:51:35 2018 +0000

    ISIS-1744: removes work-around code for prior to DN 5.1.5
---
 .../datanucleus/DataNucleusLifeCycleHelper.java    | 26 ++++------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusLifeCycleHelper.java
 
b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusLifeCycleHelper.java
index fc5669e..398c30f 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusLifeCycleHelper.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusLifeCycleHelper.java
@@ -26,15 +26,12 @@ import java.util.function.Consumer;
 
 import javax.jdo.PersistenceManagerFactory;
 
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.PersistenceNucleusContext;
-import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
 import org.datanucleus.enhancer.EnhancementHelper;
-import org.datanucleus.store.AbstractStoreManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.isis.core.runtime.system.context.IsisContext;
+
 /**
  * 
  * Purges any state associated with DataNucleus.
@@ -78,11 +75,7 @@ public class DataNucleusLifeCycleHelper {
                        
                        persistenceManagerFactory.close();
                        
-                       // XXX uses reflection prior to DN v5.1.5
-                       // remove once DN v5.1.5 is released
-                       // dnUnregisterClassesManagedBy(cl);
-                       
-                       // XXX for info, why we do this see
+                       // for info, on why we do this see
                        // 
https://github.com/datanucleus/datanucleus-core/issues/272
                        EnhancementHelper.getInstance().unregisterClasses(cl);
                        
@@ -92,18 +85,7 @@ public class DataNucleusLifeCycleHelper {
 
        }
     
-    // -- HELPER
-    
-       // TODO remove once DN v5.1.5 is released
-       private static void dnUnregisterClassesManagedBy(ClassLoader cl) {
-       if(cl==null)
-               return;
-               visitDNRegisteredClasses(map->
-                       map.entrySet()
-                       
.removeIf(entry->cl.equals(entry.getKey().getClassLoader()))
-               );
-       }
-    
+
     // -- LOW LEVEL REFLECTION
     
        // TODO remove once DN v5.1.5 is released

-- 
To stop receiving notification emails like this one, please contact
ahu...@apache.org.

Reply via email to