Check for null streams before attaching a "cause" property. Fixes #767.

jchambers · May 9, 2020 · ace2c84 · ace2c84
1 parent 7a82a54
commit ace2c84
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pushy/src/main/java/com/eatthepath/pushy/apns/ApnsClientHandler.java b/pushy/src/main/java/com/eatthepath/pushy/apns/ApnsClientHandler.java
@@ -472,7 +472,11 @@ public void onGoAwayReceived(final int lastStreamId, final long errorCode, final
     @Override
     protected void onStreamError(final ChannelHandlerContext context, final boolean isOutbound, final Throwable cause, final Http2Exception.StreamException streamException) {
         final Http2Stream stream = this.connection().stream(streamException.streamId());
-        stream.setProperty(this.streamErrorCausePropertyKey, streamException);
+
+        // The affected stream may already be closed (or was never open in the first place)
+        if (stream != null) {
+            stream.setProperty(this.streamErrorCausePropertyKey, streamException);
+        }
 
         super.onStreamError(context, isOutbound, cause, streamException);
     }