Skip to content

Commit

Permalink
Align NettyProperties with Netty's defaults
Browse files Browse the repository at this point in the history
Prior to this commit, `NettyProperties` would use `DISABLED` as the
default level for leak detection in Netty. This is not the default value
enforced by Netty, which is `SIMPLE`.

This commit changes the default configuration property value and ensures
that both stay in sync.

Fixes gh-27046
  • Loading branch information
bclozel committed Jun 23, 2021
1 parent 01f8cb7 commit bf17f50
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class NettyProperties {
/**
* Level of leak detection for reference-counted buffers.
*/
private LeakDetection leakDetection = LeakDetection.DISABLED;
private LeakDetection leakDetection = LeakDetection.SIMPLE;

public LeakDetection getLeakDetection() {
return this.leakDetection;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.boot.autoconfigure.netty;

import io.netty.util.ResourceLeakDetector;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;

/**
* Tests for {@link NettyProperties}
*
* @author Brian Clozel
*/
class NettyPropertiesTests {

@Test
void defaultValueShouldMatchNettys() {
NettyProperties properties = new NettyProperties();
assertThat(ResourceLeakDetector.Level.valueOf(properties.getLeakDetection().name()))
.isEqualTo(ResourceLeakDetector.getLevel());
}

}

0 comments on commit bf17f50

Please sign in to comment.