Added checks for non-installed agent when using convenience methods.

raphw · Nov 30, 2015 · e42ef1d · e42ef1d
1 parent abb4357
commit e42ef1d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
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
@@ -2002,10 +2002,14 @@ public ClassFileTransformer installOn(Instrumentation instrumentation) {
         @Override
         public ClassFileTransformer installOnByteBuddyAgent() {
             try {
-                return installOn((Instrumentation) ClassLoader.getSystemClassLoader()
+                Instrumentation instrumentation = (Instrumentation) ClassLoader.getSystemClassLoader()
                         .loadClass(INSTALLER_TYPE)
                         .getDeclaredField(INSTRUMENTATION_FIELD)
-                        .get(STATIC_FIELD));
+                        .get(STATIC_FIELD);
+                if (instrumentation == null) {
+                    throw new IllegalStateException("The Byte Buddy agent is not installed");
+                }
+                return installOn(instrumentation);
             } catch (RuntimeException exception) {
                 throw exception;
             } catch (Exception exception) {

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/ClassFileLocator.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/ClassFileLocator.java
@@ -492,10 +492,14 @@ public AgentBased(Instrumentation instrumentation, ClassLoadingDelegate classLoa
          */
         public static ClassFileLocator fromInstalledAgent(ClassLoader classLoader) {
             try {
-                return new AgentBased((Instrumentation) ClassLoader.getSystemClassLoader()
+                Instrumentation instrumentation = (Instrumentation) ClassLoader.getSystemClassLoader()
                         .loadClass(INSTALLER_TYPE)
                         .getDeclaredField(INSTRUMENTATION_FIELD)
-                        .get(STATIC_FIELD), classLoader);
+                        .get(STATIC_FIELD);
+                if (instrumentation == null) {
+                    throw new IllegalStateException("The Byte Buddy agent is not installed");
+                }
+                return new AgentBased(instrumentation, classLoader);
             } catch (RuntimeException exception) {
                 throw exception;
             } catch (Exception exception) {

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ClassReloadingStrategy.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ClassReloadingStrategy.java
@@ -120,10 +120,14 @@ protected ClassReloadingStrategy(Instrumentation instrumentation, Engine engine,
      */
     public static ClassReloadingStrategy fromInstalledAgent() {
         try {
-            return new ClassReloadingStrategy((Instrumentation) ClassLoader.getSystemClassLoader()
+            Instrumentation instrumentation = (Instrumentation) ClassLoader.getSystemClassLoader()
                     .loadClass(INSTALLER_TYPE)
                     .getDeclaredField(INSTRUMENTATION_FIELD)
-                    .get(STATIC_FIELD));
+                    .get(STATIC_FIELD);
+            if (instrumentation == null) {
+                throw new IllegalStateException("The Byte Buddy agent is not installed");
+            }
+            return new ClassReloadingStrategy(instrumentation);
         } catch (RuntimeException exception) {
             throw exception;
         } catch (Exception exception) {