Integrated the fixes from https://github.com/fernandospr/javapns-jdk1…

…6/pull/5/files - should clean up a memory leak
mlaccetti · Jul 12, 2016 · be42077 · be42077
1 parent 51f7809
commit be42077
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/javapns/Push.java b/src/main/java/javapns/Push.java
@@ -211,16 +211,21 @@ public static PushedNotifications payload(final Payload payload, final Object ke
     if (numberOfThreads <= 0) {
       return sendPayload(payload, keystore, password, production, devices);
     }
+
     final AppleNotificationServer server = new AppleNotificationServerBasicImpl(keystore, password, production);
     final List<Device> deviceList = Devices.asDevices(devices);
     final NotificationThreads threads = new NotificationThreads(server, payload, deviceList, numberOfThreads);
     threads.start();
+
     try {
       threads.waitForAllThreads(true);
     } catch (final InterruptedException e) {
       logger.error(e.getMessage(), e);
     }
-    return threads.getPushedNotifications();
+
+    final PushedNotifications notifications = threads.getPushedNotifications();
+    threads.destroy();
+    return notifications;
   }
 
   /**
@@ -271,16 +276,21 @@ public static PushedNotifications payloads(final Object keystore, final String p
     if (numberOfThreads <= 0) {
       return sendPayloads(keystore, password, production, payloadDevicePairs);
     }
+
     final AppleNotificationServer server = new AppleNotificationServerBasicImpl(keystore, password, production);
     final List<PayloadPerDevice> payloadPerDevicePairs = Devices.asPayloadsPerDevices(payloadDevicePairs);
     final NotificationThreads threads = new NotificationThreads(server, payloadPerDevicePairs, numberOfThreads);
     threads.start();
+
     try {
       threads.waitForAllThreads(true);
     } catch (final InterruptedException e) {
       logger.error(e.getMessage(), e);
     }
-    return threads.getPushedNotifications();
+
+    final PushedNotifications notifications = threads.getPushedNotifications();
+    threads.destroy();
+    return notifications;
   }
 
   /**