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

Catch exceptions from PlatformDependent#getSystemClassLoader

Browse Source 
Motivation:
PlatformDependent#getSystemClassLoader may throw a wide variety of exceptions based upon the environment. We should handle all exceptions and continue initializing the slow path if an exception occurs.

Modifications:
- Catch Throwable in cases where PlatformDependent#getSystemClassLoader is used

Result:
Fixes https://github.com/netty/netty/issues/6038
This commit is contained in:
Scott Mitchell 2016-11-18 09:04:09 -08:00
parent c2565d8dd2
commit a043cf4a98
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/io/netty/util/internal/PlatformDependent.java
View File

@ -1163,9 +1163,11 @@ public final class PlatformDependent {
private static long maxDirectMemory0() { private static long maxDirectMemory0() {
long maxDirectMemory = 0; long maxDirectMemory = 0;
ClassLoader systemClassLoader = null;
try { try {
// Try to get from sun.misc.VM.maxDirectMemory() which should be most accurate. // Try to get from sun.misc.VM.maxDirectMemory() which should be most accurate.
Class<?> vmClass = Class.forName("sun.misc.VM", true, getSystemClassLoader()); systemClassLoader = getSystemClassLoader();
Class<?> vmClass = Class.forName("sun.misc.VM", true, systemClassLoader);
Method m = vmClass.getDeclaredMethod("maxDirectMemory"); Method m = vmClass.getDeclaredMethod("maxDirectMemory");
maxDirectMemory = ((Number) m.invoke(null)).longValue(); maxDirectMemory = ((Number) m.invoke(null)).longValue();
} catch (Throwable ignored) { } catch (Throwable ignored) {
@ -1180,9 +1182,9 @@ public final class PlatformDependent {
// Now try to get the JVM option (-XX:MaxDirectMemorySize) and parse it. // Now try to get the JVM option (-XX:MaxDirectMemorySize) and parse it.
// Note that we are using reflection because Android doesn't have these classes. // Note that we are using reflection because Android doesn't have these classes.
Class<?> mgmtFactoryClass = Class.forName( Class<?> mgmtFactoryClass = Class.forName(
"java.lang.management.ManagementFactory", true, getSystemClassLoader()); "java.lang.management.ManagementFactory", true, systemClassLoader);
Class<?> runtimeClass = Class.forName( Class<?> runtimeClass = Class.forName(
"java.lang.management.RuntimeMXBean", true, getSystemClassLoader()); "java.lang.management.RuntimeMXBean", true, systemClassLoader);
Object runtime = mgmtFactoryClass.getDeclaredMethod("getRuntimeMXBean").invoke(null); Object runtime = mgmtFactoryClass.getDeclaredMethod("getRuntimeMXBean").invoke(null);

16
common/src/main/java/io/netty/util/internal/PlatformDependent0.java
View File

@ -224,16 +224,8 @@ final class PlatformDependent0 {
Method unalignedMethod = bitsClass.getDeclaredMethod("unaligned"); Method unalignedMethod = bitsClass.getDeclaredMethod("unaligned");
unalignedMethod.setAccessible(true); unalignedMethod.setAccessible(true);
return unalignedMethod.invoke(null); return unalignedMethod.invoke(null);
} catch (ClassNotFoundException e) { } catch (Throwable cause) {
return e; return cause;
} catch (NoSuchMethodException e) {
return e;
} catch (InvocationTargetException e) {
return e;
} catch (IllegalAccessException e) {
return e;
} catch (SecurityException e) {
return e;
} }
} }
}); });
@ -245,8 +237,8 @@ final class PlatformDependent0 {
String arch = SystemPropertyUtil.get("os.arch", ""); String arch = SystemPropertyUtil.get("os.arch", "");
//noinspection DynamicRegexReplaceableByCompiledPattern //noinspection DynamicRegexReplaceableByCompiledPattern
unaligned = arch.matches("^(i[3-6]86|x86(_64)?|x64|amd64)$"); unaligned = arch.matches("^(i[3-6]86|x86(_64)?|x64|amd64)$");
Exception e = (Exception) maybeUnaligned; Throwable t = (Throwable) maybeUnaligned;
logger.debug("java.nio.Bits.unaligned: unavailable, " + unaligned, e); logger.debug("java.nio.Bits.unaligned: unavailable {}", unaligned, t);
} }
UNALIGNED = unaligned; UNALIGNED = unaligned;

12
transport/src/main/java/io/netty/channel/nio/NioEventLoop.java
View File

@ -171,10 +171,8 @@ public final class NioEventLoop extends SingleThreadEventLoop {
"sun.nio.ch.SelectorImpl", "sun.nio.ch.SelectorImpl",
false, false,
PlatformDependent.getSystemClassLoader()); PlatformDependent.getSystemClassLoader());
} catch (ClassNotFoundException e) { } catch (Throwable cause) {
return e; return cause;
} catch (SecurityException e) {
return e;
} }
} }
}); });
@ -182,9 +180,9 @@ public final class NioEventLoop extends SingleThreadEventLoop {
if (!(maybeSelectorImplClass instanceof Class) || if (!(maybeSelectorImplClass instanceof Class) ||
// ensure the current selector implementation is what we can instrument. // ensure the current selector implementation is what we can instrument.
!((Class<?>) maybeSelectorImplClass).isAssignableFrom(selector.getClass())) { !((Class<?>) maybeSelectorImplClass).isAssignableFrom(selector.getClass())) {
if (maybeSelectorImplClass instanceof Exception) { if (maybeSelectorImplClass instanceof Throwable) {
Exception e = (Exception) maybeSelectorImplClass; Throwable t = (Throwable) maybeSelectorImplClass;
logger.trace("failed to instrument a special java.util.Set into: {}", selector, e); logger.trace("failed to instrument a special java.util.Set into: {}", selector, t);
} }
return selector; return selector;
} }