Changeset 330

Timestamp:

04/05/06 09:54:58

Author:

douglm

Message:

1. Fix a problem preventing users in multiple groups from selecting a group.

2. Ensure we rollback when certain exceptions occur. Might have been eating jdbc pool entries.

Files:

• branches/REL-3.0/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (1 diff)
• branches/REL-3.0/calendar3/calCore/src/org/bedework/calcore/hibernate/HibSession.java (modified) (1 diff)
• branches/REL-3.0/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (1 diff)

branches/REL-3.0/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java

@@ -494 +494 @@
-    try {
-      if (sess != null) {
+        if (sess.transactionStarted()) {
+          sess.rollback();
+        }
-        sess.disconnect();
-      }

branches/REL-3.0/calendar3/calCore/src/org/bedework/calcore/hibernate/HibSession.java

@@ -249 +249 @@
-  }
-
+  /** Return true if we have a transaction started
+   * 
+   * @return boolean
+   */
+  public boolean transactionStarted() {
+    return tx != null;
+  }
+
-  /** Commit a transaction
-   *

branches/REL-3.0/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

@@ -591 +591 @@
-
-    BwAdminGroup ag = (BwAdminGroup)adgrps.findGroup(groupName);
+    if (ag != null) {
+        adgrps.getMembers(ag);
+    }
-
-    if (debug) {