[#4327] Ensure toString() will not throw IllegalReferenceCountException
Motivation: As toString() is often used while logging we need to ensure this produces no exception. Modifications: Ensure we never throw an IllegalReferenceCountException. Result: Be able to log without produce exceptions.
This commit is contained in:
parent
bd61b96efa
commit
99b4aec46d
@ -78,8 +78,16 @@ public class DefaultByteBufHolder implements ByteBufHolder {
|
|||||||
return data.release(decrement);
|
return data.release(decrement);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return {@link ByteBuf#toString()} without checking the reference count first. This is useful to implemement
|
||||||
|
* {@link #toString()}.
|
||||||
|
*/
|
||||||
|
protected final String contentToString() {
|
||||||
|
return data.toString();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return StringUtil.simpleClassName(this) + '(' + content().toString() + ')';
|
return StringUtil.simpleClassName(this) + '(' + contentToString() + ')';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,32 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2015 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you 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:
|
||||||
|
*
|
||||||
|
* http://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 io.netty.buffer;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
public class DefaultByteBufHolderTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testToString() {
|
||||||
|
ByteBufHolder holder = new DefaultByteBufHolder(Unpooled.buffer());
|
||||||
|
assertEquals(1, holder.refCnt());
|
||||||
|
assertNotNull(holder.toString());
|
||||||
|
assertTrue(holder.release());
|
||||||
|
assertNotNull(holder.toString());
|
||||||
|
}
|
||||||
|
}
|
@ -68,7 +68,7 @@ public abstract class WebSocketFrame extends DefaultByteBufHolder {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return StringUtil.simpleClassName(this) + "(data: " + content().toString() + ')';
|
return StringUtil.simpleClassName(this) + "(data: " + contentToString() + ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -17,7 +17,6 @@ package io.netty.channel.sctp;
|
|||||||
|
|
||||||
import com.sun.nio.sctp.MessageInfo;
|
import com.sun.nio.sctp.MessageInfo;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.buffer.ByteBufUtil;
|
|
||||||
import io.netty.buffer.DefaultByteBufHolder;
|
import io.netty.buffer.DefaultByteBufHolder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -183,15 +182,9 @@ public final class SctpMessage extends DefaultByteBufHolder {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
if (refCnt() == 0) {
|
|
||||||
return "SctpFrame{" +
|
|
||||||
"streamIdentifier=" + streamIdentifier + ", protocolIdentifier=" + protocolIdentifier +
|
|
||||||
", unordered=" + unordered +
|
|
||||||
", data=(FREED)}";
|
|
||||||
}
|
|
||||||
return "SctpFrame{" +
|
return "SctpFrame{" +
|
||||||
"streamIdentifier=" + streamIdentifier + ", protocolIdentifier=" + protocolIdentifier +
|
"streamIdentifier=" + streamIdentifier + ", protocolIdentifier=" + protocolIdentifier +
|
||||||
", unordered=" + unordered +
|
", unordered=" + unordered +
|
||||||
", data=" + ByteBufUtil.hexDump(content()) + '}';
|
", data=" + contentToString() + '}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user