X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/jaceP2P.git/blobdiff_plain/ff1e99092ecad49a21f654b345b130b3f4bc7718..de28e13f31d33f1741cd941ba8103684979c226f:/src/jaceP2P/JaceSpawnerServer.java

diff --git a/src/jaceP2P/JaceSpawnerServer.java b/src/jaceP2P/JaceSpawnerServer.java
index 5515dc7..e210d88 100644
--- a/src/jaceP2P/JaceSpawnerServer.java
+++ b/src/jaceP2P/JaceSpawnerServer.java
@@ -127,20 +127,26 @@ public class JaceSpawnerServer extends UnicastRemoteObject implements
 		else
 			System.out.println("Node " + oldNode.getName() + " of rank " + rank
 					+ " hasn't been removed");
-		Register.Instance().addNode(node);
+		
+		if( node != null )
+		{
+			Register.Instance().addNode(node);
 
-		TaskId myTaskId = Register.Instance().getListeOfTasks()
+			TaskId myTaskId = Register.Instance().getListeOfTasks()
 				.getTaskIdOfHostStub(oldNode.getStub());
 
-		myTaskId.setHostIP(node.getIP());
+			myTaskId.setHostIP(node.getIP());
 
-		myTaskId.setHostName(node.getName());
-		myTaskId.setHostStub(node.getStub());
-		// Register.Instance().setVersion(Register.Instance().getVersion()+1);
-		RunningApplication.Instance().incrementNumberOfDisconnections();
-		System.out.println("Replacing node: " + oldNode.getName() + " with: "
+			myTaskId.setHostName(node.getName());
+			myTaskId.setHostStub(node.getStub());
+			// Register.Instance().setVersion(Register.Instance().getVersion()+1);
+			RunningApplication.Instance().incrementNumberOfDisconnections();
+			System.out.println("Replacing node: " + oldNode.getName() + " with: "
 				+ node.getName());
-		// Register.Instance().getListeOfTasks().viewAll();
+			// Register.Instance().getListeOfTasks().viewAll();
+		} else {
+			System.err.println( "ReplaceDaemon: The new node is null!" ) ;
+		}
 	}
 
 //	@Override