From ba84e4466060b5c4f13e26075bfdde8a45c5738f Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 5 Aug 2014 11:21:11 -0700 Subject: [PATCH] Fix a bug where ChannelFuture.setFailure(null) doesn't fail Motivation: We forgot to do a null check on the cause parameter of ChannelFuture.setFailure(cause) Modifications: Add a null check Result: Fixed issue: #2728 --- .../java/org/jboss/netty/channel/DefaultChannelFuture.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java b/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java index 4c347cee12..7c36f07519 100644 --- a/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java +++ b/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java @@ -364,6 +364,10 @@ public class DefaultChannelFuture implements ChannelFuture { } public boolean setFailure(Throwable cause) { + if (cause == null) { + throw new NullPointerException("cause"); + } + synchronized (this) { // Allow only once. if (done) {