Changeset 2080

Timestamp:

Oct 17, 2013, 2:40:46 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #518: Installation wizard must be run twice

File:

• extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

@@ -983 +983 @@
   */
   public AnnotationTypeCategory createAnnotationTypeCategory(SessionControl sc, 
-    Subtype subtype, Annotationtype... annotationTypes)
+    Subtype subtype)
   {
     AnnotationTypeCategory cat = null;
@@ -991 +991 @@
       cat = AnnotationTypeCategory.getNew(dc);
       cat.setName(subtype.getName());
-      
-      if (annotationTypes != null)
-      {
-        for (Annotationtype annotationType : annotationTypes)
-        {
-          AnnotationType at = annotationType.load(dc);
-          if (at != null)
-          {
-            at.addCategory(cat);
-          }
-        }
-      }
-      
       dc.saveItem(cat);
       dc.commit();
@@ -1063 +1050 @@
       if (createIfMissing)
       {
-        AnnotationTypeCategory cat = createAnnotationTypeCategory(dc.getSessionControl(), 
-            subtype, annotationTypes);
+        AnnotationTypeCategory cat = createAnnotationTypeCategory(dc.getSessionControl(), subtype);
+        // Add the category to annotation types in the original transaction
+        if (annotationTypes != null)
+        {
+          for (Annotationtype annotationType : annotationTypes)
+          {
+            AnnotationType at = annotationType.load(dc);
+            if (at != null)
+            {
+              at.addCategory(cat);
+            }
+          }
+        }
+
         json.put("id", cat.getId());
         json.put("status", "ok");