really remove node

[jSite2.git] / src / net / pterodactylus / jsite / core / NodeManager.java

diff --git a/src/net/pterodactylus/jsite/core/NodeManager.java b/src/net/pterodactylus/jsite/core/NodeManager.java
index b9404c7..ba71708 100644 (file)
--- a/src/net/pterodactylus/jsite/core/NodeManager.java
+++ b/src/net/pterodactylus/jsite/core/NodeManager.java
@@ -40,6 +40,7 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.fcp.highlevel.HighLevelClient;
 import net.pterodactylus.fcp.highlevel.HighLevelClientListener;
+import net.pterodactylus.fcp.highlevel.HighLevelException;
 import net.pterodactylus.fcp.highlevel.KeyGenerationResult;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
@@ -346,6 +347,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                        if (nodeClients.containsKey(node)) {
                                disconnect(node);
                        }
+                       nodes.remove(node);
                        node.removePropertyChangeListener(this);
                        fireNodeRemoved(node);
                }
@@ -429,10 +431,10 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *         public key at index <code>1</code>
         * @throws IOException
         *             if an I/O error occurs communicating with the node
-        * @throws NoNodeException
-        *             if no node is configured
+        * @throws JSiteException
+        *             if there is a problem with the node
         */
-       public String[] generateKeyPair() throws IOException, NoNodeException {
+       public String[] generateKeyPair() throws IOException, JSiteException {
                if (nodes.isEmpty()) {
                        throw new NoNodeException("no node configured");
                }
@@ -441,6 +443,8 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                try {
                        KeyGenerationResult keyGenerationResult = highLevelClient.generateKey().getResult();
                        return new String[] { keyGenerationResult.getInsertURI(), keyGenerationResult.getRequestURI() };
+               } catch (HighLevelException hle1) {
+                       throw new BackendException(hle1);
                } catch (InterruptedException e) {
                        /* ignore. */
                }