[401763] Make CDO Server more robust against data dictionary changes drops/S20130312-0531drops/I20130312-0633

https://bugs.eclipse.org/bugs/show_bug.cgi?id=401763

1 files changed, 10 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index f2e85abdf1..3bd14d1340 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -620,8 +620,16 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
 
     database = DBUtil.openDatabase(dbAdapter, dbConnectionProvider, repository.getName());
     IDBSchemaTransaction schemaTransaction = database.openSchemaTransaction();
-    schemaTransaction.ensureSchema(CDODBSchema.INSTANCE);
-    schemaTransaction.commit();
+
+    try
+    {
+      schemaTransaction.ensureSchema(CDODBSchema.INSTANCE);
+      schemaTransaction.commit();
+    }
+    finally
+    {
+      schemaTransaction.close();
+    }
 
     LifecycleUtil.activate(idHandler);
     LifecycleUtil.activate(metaDataManager);