From f0b8e638ad44263f7e08eac72a1770479334d282 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Sat, 20 Jun 2020 15:56:35 +0100
Subject: [PATCH] Avoid dependency on netty-common in DataBufferUtils

See: gh-22594
---
 .../org/springframework/core/io/buffer/DataBufferUtils.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
index eb2927677cf2..cfedb647470f 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
@@ -39,7 +39,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
-import io.netty.util.IllegalReferenceCountException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.reactivestreams.Publisher;
@@ -502,9 +501,10 @@ public static boolean release(@Nullable DataBuffer dataBuffer) {
 				try {
 					return pooledDataBuffer.release();
 				}
-				catch (IllegalReferenceCountException ex) {
+				catch (IllegalStateException ex) {
+					// Avoid dependency on Netty: IllegalReferenceCountException
 					if (logger.isDebugEnabled()) {
-						logger.debug("RefCount already at 0", ex);
+						logger.debug("Failed to release PooledDataBuffer", ex);
 					}
 					return false;
 				}