andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure we only call ReferenceCountUtil.safeRelease(...) in finalize() if the refCnt() > 0

Browse Source 
Motivation:

We need to ensure we only call ReferenceCountUtil.safeRelease(...) in finalize() if the refCnt() > 0 as otherwise we will log a message about IllegalReferenceCountException.

Modification:

Check for a refCnt() > 0 before try to release

Result:

No more IllegalReferenceCountException produced when run finalize() on OpenSsl* objects that where explicit released before.
This commit is contained in:
Norman Maurer 2016-08-09 18:14:22 +02:00
parent ede1a363be
commit 6f8b2072e7
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handler/src/main/java/io/netty/handler/ssl/OpenSsl.java
View File

@ -18,6 +18,8 @@ package io.netty.handler.ssl;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.handler.ssl.util.SelfSignedCertificate; import io.netty.handler.ssl.util.SelfSignedCertificate;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.ReferenceCounted;
import io.netty.util.internal.NativeLibraryLoader; import io.netty.util.internal.NativeLibraryLoader;
import io.netty.util.internal.SystemPropertyUtil; import io.netty.util.internal.SystemPropertyUtil;
import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
@ -432,4 +434,10 @@ public final class OpenSsl {
private static String normalize(String value) { private static String normalize(String value) {
return value.toLowerCase(Locale.US).replaceAll("[^a-z0-9]+", ""); return value.toLowerCase(Locale.US).replaceAll("[^a-z0-9]+", "");
} }
static void releaseIfNeeded(ReferenceCounted counted) {
if (counted.refCnt() > 0) {
ReferenceCountUtil.safeRelease(counted);
}
}
} }

4
handler/src/main/java/io/netty/handler/ssl/OpenSslContext.java
View File

@ -22,8 +22,6 @@ import java.security.cert.Certificate;
import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLException; import javax.net.ssl.SSLException;
import static io.netty.util.ReferenceCountUtil.safeRelease;
/** /**
* This class will use a finalizer to ensure native resources are automatically cleaned up. To avoid finalizers * This class will use a finalizer to ensure native resources are automatically cleaned up. To avoid finalizers
* and manually release the native memory see {@link ReferenceCountedOpenSslContext}. * and manually release the native memory see {@link ReferenceCountedOpenSslContext}.
@ -53,6 +51,6 @@ public abstract class OpenSslContext extends ReferenceCountedOpenSslContext {
@SuppressWarnings("FinalizeDeclaration") @SuppressWarnings("FinalizeDeclaration")
protected final void finalize() throws Throwable { protected final void finalize() throws Throwable {
super.finalize(); super.finalize();
safeRelease(this); OpenSsl.releaseIfNeeded(this);
} }
} }

2
handler/src/main/java/io/netty/handler/ssl/OpenSslEngine.java
View File

@ -37,6 +37,6 @@ public final class OpenSslEngine extends ReferenceCountedOpenSslEngine {
@SuppressWarnings("FinalizeDeclaration") @SuppressWarnings("FinalizeDeclaration")
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
super.finalize(); super.finalize();
safeRelease(this); OpenSsl.releaseIfNeeded(this);
} }
} }