diff options
| author | mtaal | 2011-04-19 06:47:32 +0000 |
|---|---|---|
| committer | mtaal | 2011-04-19 06:47:32 +0000 |
| commit | db7a5ca084b1ce31531e898e212827b9561e4610 (patch) | |
| tree | 68d80fe32207a3c15eec9b0572cdbfad2edee289 | |
| parent | db723ccddf45639d5adf68287cc4ea0f2b90fa07 (diff) | |
| download | org.eclipse.emf.teneo-db7a5ca084b1ce31531e898e212827b9561e4610.tar.gz org.eclipse.emf.teneo-db7a5ca084b1ce31531e898e212827b9561e4610.tar.xz org.eclipse.emf.teneo-db7a5ca084b1ce31531e898e212827b9561e4610.zip | |
[343232]
2 files changed, 13 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java index b60958df4..97fb02d85 100644 --- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java +++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: HbEntityDataStore.java,v 1.35 2011/03/03 16:44:55 mtaal Exp $ + * $Id: HbEntityDataStore.java,v 1.36 2011/04/19 06:47:32 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate; @@ -66,7 +66,7 @@ import org.hibernate.type.Type; * Adds Hibernate Entitymanager behavior to the hbDataStore. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.35 $ + * @version $Revision: 1.36 $ */ @SuppressWarnings("deprecation") public class HbEntityDataStore extends HbDataStore implements @@ -86,6 +86,10 @@ public class HbEntityDataStore extends HbDataStore implements /** Initializes this Data Store */ @Override public void initialize() { + if (ejb3Configuration != null) { + ejb3Configuration = null; + } + MappingUtil.registerHbExtensions(getExtensionManager()); try { diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbSessionDataStore.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbSessionDataStore.java index 8ad75d5ad..d74e363b0 100644 --- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbSessionDataStore.java +++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbSessionDataStore.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: HbSessionDataStore.java,v 1.30 2011/03/03 16:44:55 mtaal Exp $ + * $Id: HbSessionDataStore.java,v 1.31 2011/04/19 06:47:32 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate; @@ -45,7 +45,7 @@ import org.hibernate.event.InitializeCollectionEventListener; * implementing/registering your own HbDataStoreFactory in the HibernateHelper. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.30 $ + * @version $Revision: 1.31 $ */ @SuppressWarnings("unchecked") @@ -68,6 +68,11 @@ public class HbSessionDataStore extends HbBaseSessionDataStore { /** Initializes this Data Store */ @Override public void initialize() { + + if (hbConfiguration != null) { + hbConfiguration = null; + } + MappingUtil.registerHbExtensions(getExtensionManager()); PackageRegistryProvider.getInstance().setThreadPackageRegistry( |