Changeset 3269

Timestamp:

01/12/09 08:49:34 (14 months ago)

Author:

jmoore

Message:

OmeroClustering : Fixing NPEs on early destroy()

(cherry picked from commit cf4827042bb1988a9839c389e5a667b8d83b1791)

Location:

trunk/components/blitz

Files:

• src/ome/services/blitz/fire/Ring.java (modified) (2 diffs)
• test/ome/services/blitz/test/ClusteredRingTest.java (modified) (1 diff)

trunk/components/blitz/src/ome/services/blitz/fire/Ring.java

@@ -209 +209 @@
     public void destroy() {
         try {
-            this.clusterAdapter.deactivate();
+            if (this.clusterAdapter != null) {
+                this.clusterAdapter.deactivate();
+            }
             remove(MANAGERS + uuid);
             int count = jdbc.update("delete from session_ring where value = ?", uuid);
@@ -217 +219 @@
             log.error("Error stopping ring " + this, e);
         } finally {
-            cluster.down(this.uuid);
+            if (cluster != null) {
+                cluster.down(this.uuid);
+            }
         }
     }

trunk/components/blitz/test/ome/services/blitz/test/ClusteredRingTest.java

@@ -150 +150 @@
     @Test
     public void testIfRedirectIsDeletedAnotherHostTakesOver() throws Exception {
-        fails();
+        fail();
     }
 }