1 files changed, 8 insertions, 15 deletions
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/NodeImpl.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/NodeImpl.java
index 86d2e9bbc6..2500817100 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/NodeImpl.java
+++ b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/NodeImpl.java
@@ -29,10 +29,6 @@ import org.apache.tuscany.sca.guardian.GuardianMember;
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
-import org.apache.tuscany.sca.guardian.exceptions.BackupFailedException;
-import org.apache.tuscany.sca.guardian.exceptions.BackupJoinedException;
-import org.apache.tuscany.sca.guardian.exceptions.PrimaryExistsException;
-import org.apache.tuscany.sca.guardian.exceptions.PrimaryFailedException;
 import org.osoa.sca.annotations.Destroy;
 import org.osoa.sca.annotations.OneWay;
 
@@ -45,8 +41,6 @@ public class NodeImpl implements Node, TestInterface {
     private Context mainContext;
     private Context primaryContext;
     private Context backupContext;
-    private List<GlobalException> exListMain;
-    private List<GlobalException> exListPrimary;
     private int role;
     private boolean isExecuting;
     private String pID;
@@ -59,17 +53,16 @@ public class NodeImpl implements Node, TestInterface {
     private boolean forceAUFException;
 
     public NodeImpl() {
-        exListMain = new LinkedList();
-        exListMain.add(new PrimaryFailedException());
-        exListMain.add(new PrimaryExistsException());
 
-        exListPrimary = new LinkedList();
-        exListPrimary.add(new BackupFailedException());
-        exListPrimary.add(new BackupJoinedException());
-        exListPrimary.add(new PrimaryServiceFailureException());
+        mainContext = new Context("MAIN");
+        mainContext.addException(PrimaryFailedException.class);
+        mainContext.addException(PrimaryExistsException.class);
+
+        primaryContext = new Context("PRIMARY");
+        primaryContext.addException(BackupFailedException.class);
+        primaryContext.addException(BackupJoinedException.class);
+        primaryContext.addException(PrimaryServiceFailureException.class);
 
-        mainContext = new Context("MAIN", exListMain);
-        primaryContext = new Context("PRIMARY", exListPrimary);
         backupContext = new Context("BACKUP", null);
 
         updates = new LinkedList();