rpytel1
diff --git a/‎Assignment3/src/assignment3/node/IComponent.java
Copy file name to clipboardExpand all lines: Assignment3/src/assignment3/node/IComponent.java
+1-1Lines changed: 1 addition & 1 deletion b/‎Assignment3/src/assignment3/node/IComponent.java
Copy file name to clipboardExpand all lines: Assignment3/src/assignment3/node/IComponent.java
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Assignment3/src/assignment3/node/Node.java
Copy file name to clipboardExpand all lines: Assignment3/src/assignment3/node/Node.java
+3-3Lines changed: 3 additions & 3 deletions b/‎Assignment3/src/assignment3/node/Node.java
Copy file name to clipboardExpand all lines: Assignment3/src/assignment3/node/Node.java
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎Assignment3/src/assignment3/server/Client1.java
Copy file name to clipboardExpand all lines: Assignment3/src/assignment3/server/Client1.java
+3-11Lines changed: 3 additions & 11 deletions b/‎Assignment3/src/assignment3/server/Client1.java
Copy file name to clipboardExpand all lines: Assignment3/src/assignment3/server/Client1.java
+3-11Lines changed: 3 additions & 11 deletions
@@ -15,6 +15,6 @@ public interface IComponent extends Remote {
 	public void receiveChangeRoot(Message message, Link link) throws RemoteException ;
 	public void setEntities(IComponent[] entities) throws RemoteException ;
 	public void wakeUp() throws RemoteException;
-	public void isAlive() throws RemoteException;
+	public IComponent[] getEntities() throws RemoteException;
 
 }
@@ -16,7 +16,7 @@
 
 public class Node extends UnicastRemoteObject implements IComponent {
 
-    private IComponent[] nodes;
+    private IComponent[] nodes = null;
 
     private int id;
     private NodeState state;
@@ -518,7 +518,7 @@ public void setEntities(IComponent[] entities) throws RemoteException {
     }
 
     @Override
-    public void isAlive() throws RemoteException{
-    	System.out.println("Node "+ id+ " is up");
+    public IComponent[] getEntities() throws RemoteException{
+    	return nodes;
     }
 }
@@ -143,18 +143,10 @@ public static void setRegistry() throws NotBoundException, NumberFormatException
         //Scanner scan = new Scanner(System.in);
         //scan.nextLine();
         for (int i=0; i<numProc; i++){
-	        success = false;
-	        while(!success){
-	        	try{
-	        		RMI_IDS[localIDS.get(i)].isAlive();
-	        		success = true;
-	        	}
-	        	catch(RemoteException e){
-	        		System.err.println("Client 2 not initialized its processes yet");
-	        		//e.printStackTrace();
-	        	}
+	        while(RMI_IDS[i].getEntities()==null){
+	        	System.err.println("Node "+i+" not initialized yet");
 	        }
-        }
+	    }
         myThreads[0].start();
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ public interface IComponent extends Remote {`
`15`	`15`	`public void receiveChangeRoot(Message message, Link link) throws RemoteException ;`
`16`	`16`	`public void setEntities(IComponent[] entities) throws RemoteException ;`
`17`	`17`	`public void wakeUp() throws RemoteException;`
`18`		`- public void isAlive() throws RemoteException;`
	`18`	`+ public IComponent[] getEntities() throws RemoteException;`
`19`	`19`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`public class Node extends UnicastRemoteObject implements IComponent {`
`18`	`18`
`19`		`- private IComponent[] nodes;`
	`19`	`+ private IComponent[] nodes = null;`
`20`	`20`
`21`	`21`	`private int id;`
`22`	`22`	`private NodeState state;`
`@@ -518,7 +518,7 @@ public void setEntities(IComponent[] entities) throws RemoteException {`
`518`	`518`	`}`
`519`	`519`
`520`	`520`	`@Override`
`521`		`- public void isAlive() throws RemoteException{`
`522`		`- System.out.println("Node "+ id+ " is up");`
	`521`	`+ public IComponent[] getEntities() throws RemoteException{`
	`522`	`+ return nodes;`
`523`	`523`	`}`
`524`	`524`	`}`