Merge pull request #295 from tmurakam/feature/fix-monitor-close

fix #294: ApnsConnectionImpl.monitorSocket() closes invalid socket.

Author: matzew

src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java

@@ -132,8 +132,8 @@ public synchronized void close() {
         Utilities.close(socket);
     }
 
-    private void monitorSocket(final Socket socket) {
-        logger.debug("Launching Monitoring Thread for socket {}", socket);
+    private void monitorSocket(final Socket socketToMonitor) {
+        logger.debug("Launching Monitoring Thread for socket {}", socketToMonitor);
 
         Thread t = threadFactory.newThread(new Runnable() {
             final static int EXPECTED_SIZE = 6;
@@ -145,7 +145,7 @@ public void run() {
                 try {
                     InputStream in;
                     try {
-                        in = socket.getInputStream();
+                        in = socketToMonitor.getInputStream();
                     } catch (IOException ioe) {
                         logger.warn("The value of socket is null", ioe);
                         in = null;
@@ -156,7 +156,7 @@ public void run() {
                         logger.debug("Error-response packet {}", Utilities.encodeHex(bytes));
                         // Quickly close socket, so we won't ever try to send push notifications
                         // using the defective socket.
-                        Utilities.close(socket);
+                        Utilities.close(socketToMonitor);
 
                         int command = bytes[0] & 0xFF;
                         if (command != 8) {
@@ -222,7 +222,7 @@ public void run() {
                     logger.info("Exception while waiting for error code", e);
                     delegate.connectionClosed(DeliveryError.UNKNOWN, -1);
                 } finally {
-                    close();
+                    Utilities.close(socketToMonitor);
                     drainBuffer();
                 }
             }