/*
 *  Licensed to the Apache Software Foundation (ASF) under one
 *  or more contributor license agreements.  See the NOTICE file
 *  distributed with this work for additional information
 *  regarding copyright ownership.  The ASF licenses this file
 *  to you under the Apache License, Version 2.0 (the
 *  "License"); you may not use this file except in compliance
 *  with the License.  You may obtain a copy of the License at
 *
 *    http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing,
 *  software distributed under the License is distributed on an
 *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 *  KIND, either express or implied.  See the License for the
 *  specific language governing permissions and limitations
 *  under the License.
 */
package org.codehaus.groovy.reflection;

import org.codehaus.groovy.reflection.GroovyClassValue.ComputeValue;
import org.codehaus.groovy.reflection.v7.GroovyClassValueJava7;

class GroovyClassValueFactory {
	/**
	 * This flag is introduced as a (hopefully) temporary workaround for a JVM bug, that is to say that using
	 * ClassValue prevents the classes and classloaders from being unloaded.
	 * See https://bugs.openjdk.java.net/browse/JDK-8136353
	 * This issue does not exist on IBM Java (J9) so use ClassValue by default on that JVM.
	 */
	private static final boolean USE_CLASSVALUE;
	static {
        String isJ9 = "IBM J9 VM".equals(System.getProperty("java.vm.name")) ? "true" : "false";
        USE_CLASSVALUE = Boolean.valueOf(System.getProperty("groovy.use.classvalue", isJ9));
    }

	public static <T> GroovyClassValue<T> createGroovyClassValue(ComputeValue<T> computeValue) {
		return (USE_CLASSVALUE)
                ? new GroovyClassValueJava7<>(computeValue)
                : new GroovyClassValuePreJava7<>(computeValue);
	}
}

@@ -988,16 +988,69 @@
 ueJava7;
+%0Aimport org.codehaus.groovy.vmplugin.VMPluginFactory;
 %0A%0Aclass 
@@ -1487,14 +1487,84 @@
 ing 
-isJ9 =
+useClassValueDefault =%0A%09%09%09%09(VMPluginFactory.getPlugin().getVersion() %3E= 7 %7C%7C
  %22IB
@@ -1614,17 +1614,24 @@
 .name%22))
- 
+)%0A%09%09%09%09%09%09
 ? %22true%22
@@ -1642,16 +1642,17 @@
 false%22;%0A
+%0A
         
@@ -1732,12 +1732,28 @@
 e%22, 
-isJ9
+useClassValueDefault
 ));%0A

Use classvalue when using Java7+ to avoid memory leak