Changeset 3270 for trunk/components/blitz/test/ome/services/blitz/test/mock/MockFixture.java

Timestamp:

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

Author:

jmoore

Message:

OmeroClustering : Cleaning sessions in jdbc ring and protecting NPEs

(cherry picked from commit bcafc11e48d911ccb405680477e40d66332241d8)

Files:

• trunk/components/blitz/test/ome/services/blitz/test/mock/MockFixture.java (modified) (3 diffs)

trunk/components/blitz/test/ome/services/blitz/test/mock/MockFixture.java

@@ -39 +39 @@
 
     public final BlitzConfiguration blitz;
-    public final OmeroContext ctx;
+    public final SimpleJdbcTemplate jdbc;
     public final SessionManagerI sm;
-    public final Executor ex;
     public final SessionManager mgr;
     public final SecuritySystem ss;
-    public final SimpleJdbcTemplate jdbc;
+    public final OmeroContext ctx;
+    public final Executor ex;
+    public final Ring ring;
 
     public static OmeroContext basicContext() {
@@ -71 +72 @@
         this.test = test;
         this.ctx = ctx;
+        this.ring = (Ring) ctx.getBean("ring");
         this.ex = (Executor) ctx.getBean("executor");
         this.ss = (SecuritySystem) ctx.getBean("securitySystem");
@@ -101 +103 @@
         id.properties.setProperty("ClusterProxy","Cluster:udp -h 224.0.0.5 -p 10000");
         
-        
-        Ring ring = new Ring(jdbc);
-        ring.setApplicationEventPublisher(ctx);
-        
         blitz = new BlitzConfiguration(id, ring, mgr, ss, ex);
         this.sm = (SessionManagerI) blitz.getBlitzManager();