Allow Netty default leak detection to be overidden

See gh-32144
spring-projects · Aug 23, 2022 · 51f2e40 · 51f2e40
1 parent 6d80b60
commit 51f2e40
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 44 deletions.
diff --git a/...configure/src/main/java/org/springframework/boot/autoconfigure/netty/NettyProperties.java b/...configure/src/main/java/org/springframework/boot/autoconfigure/netty/NettyProperties.java
@@ -32,7 +32,7 @@ public class NettyProperties {
 	/**
 	 * Level of leak detection for reference-counted buffers.
 	 */
-	private LeakDetection leakDetection = LeakDetection.SIMPLE;
+	private LeakDetection leakDetection = null;
 
 	public LeakDetection getLeakDetection() {
 		return this.leakDetection;

diff --git a/...t-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...t-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1738,7 +1738,8 @@
     },
     {
       "name": "spring.netty.leak-detection",
-      "defaultValue": "simple"
+      "description": "When null, fall back to Netty system default 'simple' or value of -Dio.netty.leakDetection.level. When set, this will overrride value of -Dio.netty.leakDetection.level",
+      "defaultValue": "null"
     },
     {
       "name": "spring.quartz.jdbc.comment-prefix",

diff --git a/...gure/src/test/java/org/springframework/boot/autoconfigure/netty/NettyPropertiesTests.java b/...gure/src/test/java/org/springframework/boot/autoconfigure/netty/NettyPropertiesTests.java