From 78524f21582eacf699493af359b1581959d3796d Mon Sep 17 00:00:00 2001 From: Robert Roeser Date: Thu, 26 Jul 2018 19:45:27 -0700 Subject: [PATCH] in the frame check to see if content isn't null before trying to recycle it (#519) --- rsocket-core/src/main/java/io/rsocket/Frame.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rsocket-core/src/main/java/io/rsocket/Frame.java b/rsocket-core/src/main/java/io/rsocket/Frame.java index 3001c3f35..997255719 100644 --- a/rsocket-core/src/main/java/io/rsocket/Frame.java +++ b/rsocket-core/src/main/java/io/rsocket/Frame.java @@ -159,7 +159,7 @@ public Frame touch(@Nullable Object hint) { */ @Override public boolean release() { - if (content.release()) { + if (content != null && content.release()) { recycle(); return true; } @@ -175,7 +175,7 @@ public boolean release() { */ @Override public boolean release(int decrement) { - if (content.release(decrement)) { + if (content != null && content.release(decrement)) { recycle(); return true; }