Use reflection for security manager invocations and prefer getTargetE…

…xception over getCause for invocation target exceptions.
raphw · Aug 5, 2021 · ca9d3ab · ca9d3ab
1 parent 625d105
commit ca9d3ab
Show file tree

Hide file tree

Showing 26 changed files with 150 additions and 124 deletions.
diff --git a/byte-buddy-agent/src/main/java/net/bytebuddy/agent/ByteBuddyAgent.java b/byte-buddy-agent/src/main/java/net/bytebuddy/agent/ByteBuddyAgent.java
@@ -196,7 +196,7 @@ private static <T> T doPrivileged(PrivilegedAction<T> action) {
         } catch (ClassNotFoundException ignored) {
             return action.run();
         } catch (InvocationTargetException exception) {
-            throw new IllegalStateException("Failed to invoke access controller", exception.getCause());
+            throw new IllegalStateException("Failed to invoke access controller", exception.getTargetException());
         } catch (IllegalAccessException exception) {
             throw new IllegalStateException("Failed to access access controller", exception);
         } catch (NoSuchMethodException exception) {
@@ -1383,7 +1383,7 @@ public String resolve() {
                     } catch (IllegalAccessException exception) {
                         throw new IllegalStateException("Cannot access Java 9 process API", exception);
                     } catch (InvocationTargetException exception) {
-                        throw new IllegalStateException("Error when accessing Java 9 process API", exception.getCause());
+                        throw new IllegalStateException("Error when accessing Java 9 process API", exception.getTargetException());
                     }
                 }
             }
@@ -1655,7 +1655,7 @@ public boolean requiresExternalAttachment(String processId) {
                 } catch (IllegalAccessException exception) {
                     throw new IllegalStateException("Cannot access Java 9 process API", exception);
                 } catch (InvocationTargetException exception) {
-                    throw new IllegalStateException("Error when accessing Java 9 process API", exception.getCause());
+                    throw new IllegalStateException("Error when accessing Java 9 process API", exception.getTargetException());
                 }
             }
         }

diff --git a/byte-buddy-agent/src/main/java/net/bytebuddy/agent/Installer.java b/byte-buddy-agent/src/main/java/net/bytebuddy/agent/Installer.java
@@ -63,7 +63,7 @@ public static Instrumentation getInstrumentation() {
         } catch (NoSuchMethodException ignored) {
             /* security manager not available on current VM */
         } catch (InvocationTargetException exception) {
-            Throwable cause = exception.getCause();
+            Throwable cause = exception.getTargetException();
             if (cause instanceof RuntimeException) {
                 throw (RuntimeException) cause;
             } else {

diff --git a/byte-buddy-agent/src/test/java/net/bytebuddy/agent/AttacherTest.java b/byte-buddy-agent/src/test/java/net/bytebuddy/agent/AttacherTest.java
@@ -46,7 +46,7 @@ public void testConstructorThrowsException() throws Exception {
             constructor.newInstance();
             fail();
         } catch (InvocationTargetException exception) {
-            throw (Exception) exception.getCause();
+            throw (Exception) exception.getTargetException();
         }
     }
 

diff --git a/byte-buddy-agent/src/test/java/net/bytebuddy/agent/ByteBuddyAgentTest.java b/byte-buddy-agent/src/test/java/net/bytebuddy/agent/ByteBuddyAgentTest.java
@@ -61,7 +61,7 @@ public void testConstructorThrowsException() throws Exception {
             constructor.newInstance();
             fail();
         } catch (InvocationTargetException exception) {
-            throw (Exception) exception.getCause();
+            throw (Exception) exception.getTargetException();
         }
     }
 }
diff --git a/byte-buddy-agent/src/test/java/net/bytebuddy/agent/InstallerTest.java b/byte-buddy-agent/src/test/java/net/bytebuddy/agent/InstallerTest.java
@@ -86,7 +86,7 @@ public void testConstructorThrowsException() throws Exception {
             constructor.newInstance();
             fail();
         } catch (InvocationTargetException exception) {
-            throw (Exception) exception.getCause();
+            throw (Exception) exception.getTargetException();
         }
     }
 }
diff --git a/byte-buddy-android/src/main/java/net/bytebuddy/android/AndroidClassLoadingStrategy.java b/byte-buddy-android/src/main/java/net/bytebuddy/android/AndroidClassLoadingStrategy.java
@@ -463,7 +463,7 @@ public ClassDefItem translate(DirectClassFile directClassFile,
                         } catch (IllegalAccessException exception) {
                             throw new IllegalStateException("Cannot access an Android dex file translation method", exception);
                         } catch (InvocationTargetException exception) {
-                            throw new IllegalStateException("Cannot invoke Android dex file translation method", exception.getCause());
+                            throw new IllegalStateException("Cannot invoke Android dex file translation method", exception.getTargetException());
                         }
                     }
 
@@ -526,7 +526,7 @@ public ClassDefItem translate(DirectClassFile directClassFile,
                         } catch (InstantiationException exception) {
                             throw new IllegalStateException("Cannot instantiate dex context", exception);
                         } catch (InvocationTargetException exception) {
-                            throw new IllegalStateException("Cannot invoke Android dex file translation method", exception.getCause());
+                            throw new IllegalStateException("Cannot invoke Android dex file translation method", exception.getTargetException());
                         }
                     }
 
@@ -772,7 +772,7 @@ public dalvik.system.DexFile loadDex(File privateDirectory,
                     } catch (IllegalAccessException exception) {
                         throw new IllegalStateException("Cannot access BaseDexClassLoader#addDexPath(String, boolean)", exception);
                     } catch (InvocationTargetException exception) {
-                        Throwable cause = exception.getCause();
+                        Throwable cause = exception.getTargetException();
                         if (cause instanceof IOException) {
                             throw (IOException) cause;
                         } else {

diff --git a/.../test/java/net/bytebuddy/benchmark/ClassByExtensionBenchmarkByteBuddyInterceptorTest.java b/.../test/java/net/bytebuddy/benchmark/ClassByExtensionBenchmarkByteBuddyInterceptorTest.java
@@ -17,7 +17,7 @@ public void testProxyInterceptor() throws Exception {
             constructor.newInstance();
             fail();
         } catch (InvocationTargetException exception) {
-            throw (UnsupportedOperationException) exception.getCause();
+            throw (UnsupportedOperationException) exception.getTargetException();
         }
     }
 
@@ -29,7 +29,7 @@ public void testAccessorInterceptor() throws Exception {
             constructor.newInstance();
             fail();
         } catch (InvocationTargetException exception) {
-            throw (UnsupportedOperationException) exception.getCause();
+            throw (UnsupportedOperationException) exception.getTargetException();
         }
     }
 }
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java b/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java
@@ -11143,7 +11143,7 @@ public ResettableClassFileTransformer make(ByteBuddy byteBuddy,
                         } catch (InstantiationException exception) {
                             throw new IllegalStateException("Cannot instantiate " + executingTransformer.getDeclaringClass(), exception);
                         } catch (InvocationTargetException exception) {
-                            throw new IllegalStateException("Cannot invoke " + executingTransformer, exception.getCause());
+                            throw new IllegalStateException("Cannot invoke " + executingTransformer, exception.getTargetException());
                         }
                     }
                 }

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -409,7 +409,7 @@ public Plugin instantiate() {
                         } catch (IllegalAccessException exception) {
                             throw new IllegalStateException("Failed to access " + constructor, exception);
                         } catch (InvocationTargetException exception) {
-                            throw new IllegalStateException("Error during construction of" + constructor, exception.getCause());
+                            throw new IllegalStateException("Error during construction of" + constructor, exception.getTargetException());
                         }
                     }
                 }
@@ -716,7 +716,7 @@ public Resolution resolve(int index, Class<?> type) {
                             } catch (IllegalAccessException exception) {
                                 throw new IllegalStateException(exception);
                             } catch (InvocationTargetException exception) {
-                                throw new IllegalStateException(exception.getCause());
+                                throw new IllegalStateException(exception.getTargetException());
                             } catch (NoSuchMethodException ignored) {
                                 return Resolution.Unresolved.INSTANCE;
                             }

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java
@@ -604,7 +604,7 @@ public S load() {
                 try {
                     annotationValues.put(property.getName(), asValue(property.invoke(annotation, NO_ARGUMENT), property.getReturnType()));
                 } catch (InvocationTargetException exception) {
-                    Throwable cause = exception.getCause();
+                    Throwable cause = exception.getTargetException();
                     if (cause instanceof TypeNotPresentException) {
                         annotationValues.put(property.getName(), new AnnotationValue.ForMissingType<Void, Void>(((TypeNotPresentException) cause).typeName()));
                     } else if (cause instanceof EnumConstantNotPresentException) {
@@ -616,7 +616,7 @@ public S load() {
                                 new MethodDescription.ForLoadedMethod(((AnnotationTypeMismatchException) cause).element()),
                                 ((AnnotationTypeMismatchException) cause).foundType()));
                     } else if (!(cause instanceof IncompleteAnnotationException)) {
-                        throw new IllegalStateException("Cannot read " + property, exception.getCause());
+                        throw new IllegalStateException("Cannot read " + property, cause);
                     }
                 } catch (IllegalAccessException exception) {
                     throw new IllegalStateException("Cannot access " + property, exception);
@@ -692,7 +692,7 @@ public S load() {
                 }
                 return asValue(method.invoke(annotation, NO_ARGUMENT), method.getReturnType()).filter(property);
             } catch (InvocationTargetException exception) {
-                Throwable cause = exception.getCause();
+                Throwable cause = exception.getTargetException();
                 if (cause instanceof TypeNotPresentException) {
                     return new AnnotationValue.ForMissingType<Void, Void>(((TypeNotPresentException) cause).typeName());
                 } else if (cause instanceof EnumConstantNotPresentException) {

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/NexusAccessor.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/NexusAccessor.java
@@ -301,7 +301,7 @@ public void clean(Reference<? extends ClassLoader> reference) {
                 } catch (IllegalAccessException exception) {
                     throw new IllegalStateException("Cannot access: " + clean, exception);
                 } catch (InvocationTargetException exception) {
-                    throw new IllegalStateException("Cannot invoke: " + clean, exception.getCause());
+                    throw new IllegalStateException("Cannot invoke: " + clean, exception.getTargetException());
                 }
             }
 
@@ -318,7 +318,7 @@ public void register(String name,
                 } catch (IllegalAccessException exception) {
                     throw new IllegalStateException("Cannot access: " + register, exception);
                 } catch (InvocationTargetException exception) {
-                    throw new IllegalStateException("Cannot invoke: " + register, exception.getCause());
+                    throw new IllegalStateException("Cannot invoke: " + register, exception.getTargetException());
                 }
             }
         }

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ByteArrayClassLoader.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ByteArrayClassLoader.java
@@ -549,7 +549,7 @@ public Object getClassLoadingLock(ByteArrayClassLoader classLoader, String name)
                 } catch (IllegalAccessException exception) {
                     throw new IllegalStateException("Cannot access class loading lock for " + name + " on " + classLoader, exception);
                 } catch (InvocationTargetException exception) {
-                    throw new IllegalStateException("Error when getting " + name + " on " + classLoader, exception);
+                    throw new IllegalStateException("Error when getting " + name + " on " + classLoader, exception.getTargetException());
                 }
             }
 
@@ -617,7 +617,7 @@ public Object getClassLoadingLock(ByteArrayClassLoader classLoader, String name)
                 } catch (IllegalAccessException exception) {
                     throw new IllegalStateException("Cannot access class loading lock for " + name + " on " + classLoader, exception);
                 } catch (InvocationTargetException exception) {
-                    throw new IllegalStateException("Error when getting " + name + " on " + classLoader, exception);
+                    throw new IllegalStateException("Error when getting " + name + " on " + classLoader, exception.getTargetException());
                 }
             }
         }
@@ -766,7 +766,7 @@ public Package apply(ByteArrayClassLoader classLoader, String name) {
                 } catch (IllegalAccessException exception) {
                     throw new IllegalStateException("Cannot access " + getDefinedPackage, exception);
                 } catch (InvocationTargetException exception) {
-                    throw new IllegalStateException("Cannot invoke " + getDefinedPackage, exception.getCause());
+                    throw new IllegalStateException("Cannot invoke " + getDefinedPackage, exception.getTargetException());
                 }
             }
         }