set fcp connection to null if connection failed
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 16 May 2008 13:18:44 +0000 (13:18 +0000)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 16 May 2008 13:18:44 +0000 (13:18 +0000)
git-svn-id: http://trooper/svn/projects/jFCPlib/branch/high-level-client@890 c3eda9e8-030b-0410-8277-bc7414b0a119

src/net/pterodactylus/fcp/highlevel/HighLevelClient.java

index a347e68..93378d3 100644 (file)
@@ -303,13 +303,18 @@ public class HighLevelClient {
         *             if an I/O error occurs communicating with the node
         */
        public HighLevelCallback<ConnectResult> connect(InetAddress address, int port) throws IOException {
-               fcpConnection = new FcpConnection(address, port);
-               fcpConnection.addFcpListener(highLevelClientFcpListener);
-               fcpConnection.connect();
-               ClientHello clientHello = new ClientHello(clientName);
-               connectCallback = new HighLevelCallback<ConnectResult>(new ConnectResult());
-               fcpConnection.sendMessage(clientHello);
-               return connectCallback;
+               try {
+                       fcpConnection = new FcpConnection(address, port);
+                       fcpConnection.addFcpListener(highLevelClientFcpListener);
+                       fcpConnection.connect();
+                       ClientHello clientHello = new ClientHello(clientName);
+                       connectCallback = new HighLevelCallback<ConnectResult>(new ConnectResult());
+                       fcpConnection.sendMessage(clientHello);
+                       return connectCallback;
+               } catch (IOException ioe1) {
+                       fcpConnection = null;
+                       throw ioe1;
+               }
        }
 
        /**