Hibernate auditing: make sure that the persistence props are used for the auditing model mapping

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
index d1dc234b08..376c735bf1 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
@@ -763,7 +763,6 @@ public class HibernateStore extends Store implements IHibernateStore
   public String mapAuditingEPackages(HbDataStore dataStore, List<EPackage> auditEPackages)
   {
     // create a new persistence options to not change the original
-    final PersistenceOptions po = dataStore.getExtensionManager().getExtension(PersistenceOptions.class);
     final Properties props = new Properties();
     props.putAll(dataStore.getPersistenceOptions().getProperties());
     props.remove(PersistenceOptions.PERSISTENCE_XML);
@@ -771,7 +770,8 @@ public class HibernateStore extends Store implements IHibernateStore
     {
       props.setProperty(PersistenceOptions.PERSISTENCE_XML, PersistenceOptions.AUDITING_PERSISTENCE_XML);
     }
-
+    final PersistenceOptions po = dataStore.getExtensionManager().getExtension(PersistenceOptions.class,
+        new Object[] { props });
     PAnnotatedModel paModel = dataStore.getExtensionManager().getExtension(PersistenceMappingBuilder.class)
         .buildMapping(auditEPackages, po, dataStore.getExtensionManager(), dataStore.getPackageRegistry());
     final HibernateMappingGenerator hmg = dataStore.getExtensionManager().getExtension(HibernateMappingGenerator.class);