New development version.

[jaceP2P.git] / src / jaceP2P / JaceSpawnerServer.java

diff --git a/src/jaceP2P/JaceSpawnerServer.java b/src/jaceP2P/JaceSpawnerServer.java
index d04069b..e210d88 100644 (file)
--- a/src/jaceP2P/JaceSpawnerServer.java
+++ b/src/jaceP2P/JaceSpawnerServer.java
@@ -127,25 +127,31 @@ 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
-       public void setIdAlgo( String _s ) throws RemoteException 
-       {
-               JaceSpawner.Instance().setIdAlgo( _s ) ;
-       }
+//     @Override
+//     public void setIdAlgo( String _s ) throws RemoteException 
+//     {
+//             JaceSpawner.Instance().setIdAlgo( _s ) ;
+//     }
 }