1 files changed, 23 insertions, 20 deletions

diff --git a/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/NodeImpl.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/NodeImpl.java
index 37f4f529f0..6004468f73 100644
--- a/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/NodeImpl.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/NodeImpl.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Queue;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.apache.tuscany.sca.implementation.guardian.GuardianGroup;
 import org.apache.tuscany.sca.implementation.guardian.GuardianMember;
 import org.apache.tuscany.sca.implementation.guardian.common.Context;
 import org.osoa.sca.annotations.Init;
@@ -42,8 +43,8 @@ public class NodeImpl implements Node, TestInterface {
     private int role;
     private String pID;
     private Queue<String> updates;
-    @Reference(name = "guardian_member", required = true)
-    public GuardianMember gm;
+    @Reference(name = "guardian", required = true)
+    public GuardianGroup guardianGroup;
     @Reference(name = "nodes", required = true)
     public List<Node> nodeList;
     private boolean forcePSFException;
@@ -73,15 +74,14 @@ public class NodeImpl implements Node, TestInterface {
         forceAUFException = false;
     }
 
-    @Init
-    public void init() {
-        pID = gm.getParticipantIdentifier();
+    public void setID(String pID) {
+        this.pID = pID;
     }
 
     @OneWay
     public void execute() {
         isDead = false;
-        gm.enableContext(mainContext);
+        guardianGroup.enableContext(mainContext);
         role = PRIMARY;
 
         while (true) {
@@ -92,7 +92,7 @@ public class NodeImpl implements Node, TestInterface {
                 System.out.println(pID + "#Main context: ");
                 sleep(pID + "#Sleeping at main context...", 4000);
 
-                gm.checkExceptionStatus();
+                guardianGroup.checkExceptionStatus();
 
                 if (role == PRIMARY) {
                     //Config as primary then...
@@ -109,12 +109,13 @@ public class NodeImpl implements Node, TestInterface {
                 
             } catch (PrimaryFailedException ex) {
                 System.out.println(pID + "# Exception captured!: PrimaryFailedException");
-                System.out.println(pID + "#Needs propagation?: " + gm.propagate(ex));
+                System.out.println(pID + "#Needs propagation?: " + guardianGroup.propagate(ex));
 
-                if (gm.propagate(ex)) {
+                if (guardianGroup.propagate(ex)) {
                     //throw ex;
                     this.kill();
                     ex.printStackTrace();
+                    guardianGroup.removeContext();
                     return;
                 }
 
@@ -122,12 +123,14 @@ public class NodeImpl implements Node, TestInterface {
 
             } catch (BackupFailedException ex) {
                 System.out.println(pID + "# Exception captured!: BackupFailedException");
-                System.out.println(pID + "#Needs propagation?: " + gm.propagate(ex));
+                System.out.println(pID + "#Needs propagation?: " + guardianGroup.propagate(ex));
 
-                if (gm.propagate(ex)) {
+                if (guardianGroup.propagate(ex)) {
                     //throw ex;
                     this.kill();
                     ex.printStackTrace();
+
+                    guardianGroup.removeContext();
                     return;
                 }
             }
@@ -141,14 +144,14 @@ public class NodeImpl implements Node, TestInterface {
 
         while (true) {
 
-            gm.enableContext(primaryContext);
+            guardianGroup.enableContext(primaryContext);
 
             //blockingCheck();
 
             try {
                 System.out.println(pID + "#Primary context: ");
                 sleep(pID + "#Sleeping at primary context...", 4000);
-                gm.checkExceptionStatus();
+                guardianGroup.checkExceptionStatus();
 
                 //Process the request then...
                 System.out.println(pID + "#Processing the request...");
@@ -173,7 +176,7 @@ public class NodeImpl implements Node, TestInterface {
 
             } catch (PrimaryServiceFailureException ex) {
                 System.out.println(pID + "# Exception captured!: PrimaryServiceFailureException");
-                gm.gthrow(new PrimaryFailedException(), null);
+                guardianGroup.gthrow(new PrimaryFailedException(), null);
             } catch (BackupFailedException ex) {
                 System.out.println(pID + "# Exception captured!: BackupFailedException");
                 //backupAvailable = false;
@@ -182,7 +185,7 @@ public class NodeImpl implements Node, TestInterface {
                 System.out.println(pID + "# Exception captured!: BackupJoinedException");
                 backupAvailable = true;
             } finally {
-                gm.removeContext();
+                guardianGroup.removeContext();
             }
         }
     }
@@ -206,14 +209,14 @@ public class NodeImpl implements Node, TestInterface {
     private void backupService() {
         while (true) {
 
-            gm.enableContext(backupContext);
+            guardianGroup.enableContext(backupContext);
 
             //blockingCheck();
 
             try {
                 System.out.println(pID + "#Backup context: ");
                 sleep(pID + "#Sleeping at backup service", 4000);
-                gm.checkExceptionStatus();
+                guardianGroup.checkExceptionStatus();
 
                 applyUpdate();
 
@@ -223,15 +226,15 @@ public class NodeImpl implements Node, TestInterface {
 
             } catch (ApplyUpdateFailureException ex) {
                 System.out.println(pID + "# Exception captured!: ApplyUpdateFailureException");
-                gm.gthrow(new BackupFailedException(), null);
+                guardianGroup.gthrow(new BackupFailedException(), null);
             } finally {
-                gm.removeContext();
+                guardianGroup.removeContext();
             }
         }
     }
 
     public String getID() {
-        return gm.getParticipantIdentifier();
+        return this.pID;
     }
 
     private void sleep(String msg, int millis) {