Merge pull request #2252 from k2io/release/csec/v1.6.1

Bump CSEC Version to 1.6.1

Author: jasonjkeller

gradle.properties

@@ -1,6 +1,6 @@
 # The agent version.
 agentVersion=8.19.0
-securityAgentVersion=1.6.0
+securityAgentVersion=1.6.1
 
 newrelicDebug=false
 org.gradle.jvmargs=-Xmx2048m

newrelic-agent/src/main/java/com/newrelic/agent/instrumentation/ClassTransformerServiceImpl.java

@@ -29,7 +29,9 @@
 import com.newrelic.agent.util.DefaultThreadFactory;
 import com.newrelic.agent.util.asm.Utils;
 import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.security.instrumentation.helpers.ThreadLocalLockHelper;
 import com.newrelic.api.agent.security.schema.SecurityMetaData;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.objectweb.asm.commons.Method;
 
@@ -157,8 +159,10 @@ private PointCutClassTransformer startClassTransformer(InstrumentationProxy inst
         NewRelic.getAgent().getTransaction();
 
         // Preload Security used classes to avoid complete application thread blocking in rare scenarios.
+        ArrayUtils.isEmpty(new Object[0]);
         StringUtils.startsWithAny(StringUtils.LF, StringUtils.EMPTY, StringUtils.LF);
         new SecurityMetaData();
+        ThreadLocalLockHelper.isLockHeldByCurrentThread();
 
         contextManager.addContextClassTransformer(classTransformer.getMatcher(), classTransformer);
         for (PointCut pc : classTransformer.getPointcuts()) {