From dcee3af4beb6dee80db21c8282485bc006f296ce Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Mon, 10 Dec 2012 08:16:47 -0800 Subject: [PATCH] NPE guard for JVMPlugin.accept Issue: http://jira.grails.org/browse/GRAILS-9651 --- .../java/org/springsource/loaded/agent/JVMPlugin.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/JVMPlugin.java b/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/JVMPlugin.java index bfe7d51..34a17c0 100644 --- a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/JVMPlugin.java +++ b/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/JVMPlugin.java @@ -157,10 +157,12 @@ public class JVMPlugin implements ReloadEventProcessorPlugin, LoadtimeInstrument } public boolean accept(String slashedTypeName, ClassLoader classLoader, ProtectionDomain protectionDomain, byte[] bytes) { - if (slashedTypeName.equals("java/beans/Introspector")) { - introspectorLoaded = true; - } else if (slashedTypeName.equals("java/beans/ThreadGroupContext")) { - threadGroupContextLoaded = true; + if (slashedTypeName!=null) { + if (slashedTypeName.equals("java/beans/Introspector")) { + introspectorLoaded = true; + } else if (slashedTypeName.equals("java/beans/ThreadGroupContext")) { + threadGroupContextLoaded = true; + } } return false; }