From 45dc3be3dbb8726dfd5c965b1a57b589848191b6 Mon Sep 17 00:00:00 2001 From: Takuya Murakami Date: Fri, 26 Feb 2016 23:10:33 +0900 Subject: [PATCH 1/2] fix #294: ApnsConnectionImpl.monitorSocket() closes invalid socket. --- .../com/notnoop/apns/internal/ApnsConnectionImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java b/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java index 6739c52d..da11ec1f 100644 --- a/src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java +++ b/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) { in = null; } @@ -155,7 +155,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) { @@ -221,7 +221,7 @@ public void run() { logger.info("Exception while waiting for error code", e); delegate.connectionClosed(DeliveryError.UNKNOWN, -1); } finally { - close(); + Utilities.close(socketToMonitor); drainBuffer(); } } From 254dafb2cdf08d024f40fd07ee74fb437a8c5257 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Thu, 11 Mar 2021 09:17:14 +0100 Subject: [PATCH 2/2] :lipstick: Adding deprecation warning Signed-off-by: Matthias Wessendorf --- README.markdown | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.markdown b/README.markdown index c78c07f4..480c00ab 100644 --- a/README.markdown +++ b/README.markdown @@ -1,3 +1,10 @@ +Warning +------- + +Apple will no longer support the legacy binary protocol after March 31, 2021. Java-Apns will stop working. See [details](https://developer.apple.com/news/?id=uzyxiriy) in their announcement. + +It is recommended to use [Pushy](https://github.com/jchambers/pushy) instead, which supports Apple's HTTP/2-based APNs protocol. + Build status: * Main fork [![Build Status](https://travis-ci.org/notnoop/java-apns.png)](https://travis-ci.org/notnoop/java-apns)