Merge pull request #152 from ShaneMcC/parserShutdown

Add shutdown infra to parser.

common/src/main/java/com/dmdirc/parser/common/BaseParser.java

@@ -105,6 +105,11 @@ public abstract class BaseParser extends ThreadedParser {
         }
     }
 
+    @Override
+    public void shutdown() {
+        callbackManager.shutdown();
+    }
+
     @Override
     public void quit(final String reason) {
         disconnect(reason);

common/src/main/java/com/dmdirc/parser/common/BaseSocketAwareParser.java

@@ -69,6 +69,17 @@ public abstract class BaseSocketAwareParser extends BaseParser {
         return localPort;
     }
 
+    @Override
+    public void shutdown() {
+        try {
+            if (socket != null) {
+                socket.close();
+            }
+        } catch (IOException e) {
+        }
+        super.shutdown();
+    }
+
     /**
      * Gets the current connection timeout.
      *

common/src/main/java/com/dmdirc/parser/interfaces/Parser.java

@@ -54,6 +54,13 @@ public interface Parser {
      */
     void disconnect(String message);
 
+    /**
+     * Called when we are finished with this parser and no longer need it anymore.
+     *
+     * This allows the parser to cleanup after itself.
+     */
+    void shutdown();
+
     /**
      *
      * Disconnect from server.  This method will wait for the server to

irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java

@@ -885,18 +885,19 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
         callDebugInfo(DEBUG_INFO, "End Thread Execution");
     }
 
-    /** Close socket on destroy. */
     @Override
-    protected void finalize() throws Throwable {
+    public void shutdown() {
         try {
             // See note at disconnect() method for why we close rawSocket.
             if (rawSocket != null) {
                 rawSocket.close();
+                socket = null;
+                rawSocket = null;
             }
         } catch (IOException e) {
             callDebugInfo(DEBUG_SOCKET, "Could not close socket");
         }
-        super.finalize();
+        super.shutdown();
     }
 
     /**