You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2019/11/23 18:48:27 UTC
[groovy] branch master updated: Remove redundant checks
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 2a13999 Remove redundant checks
2a13999 is described below
commit 2a139994d25a1a6235bd6f3d89ed46e79dbaae7c
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Nov 24 02:48:01 2019 +0800
Remove redundant checks
---
.../codehaus/groovy/reflection/GroovyClassValueFactory.java | 11 ++---------
.../java/org/codehaus/groovy/runtime/ConversionHandler.java | 10 +---------
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/reflection/GroovyClassValueFactory.java b/src/main/java/org/codehaus/groovy/reflection/GroovyClassValueFactory.java
index e131215..0565f92 100644
--- a/src/main/java/org/codehaus/groovy/reflection/GroovyClassValueFactory.java
+++ b/src/main/java/org/codehaus/groovy/reflection/GroovyClassValueFactory.java
@@ -18,9 +18,9 @@
*/
package org.codehaus.groovy.reflection;
+import org.apache.groovy.util.SystemUtil;
import org.codehaus.groovy.reflection.GroovyClassValue.ComputeValue;
import org.codehaus.groovy.reflection.v7.GroovyClassValueJava7;
-import org.codehaus.groovy.vmplugin.VMPluginFactory;
class GroovyClassValueFactory {
/**
@@ -29,14 +29,7 @@ class GroovyClassValueFactory {
* 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 useClassValueDefault =
- (VMPluginFactory.getPlugin().getVersion() >= 7 || "IBM J9 VM".equals(System.getProperty("java.vm.name")))
- ? "true" : "false";
-
- USE_CLASSVALUE = Boolean.valueOf(System.getProperty("groovy.use.classvalue", useClassValueDefault));
- }
+ private static final boolean USE_CLASSVALUE = Boolean.parseBoolean(SystemUtil.getSystemPropertySafe("groovy.use.classvalue", "true"));
public static <T> GroovyClassValue<T> createGroovyClassValue(ComputeValue<T> computeValue) {
return (USE_CLASSVALUE)
diff --git a/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java b/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
index 2519b39..77a92f6 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
@@ -42,15 +42,7 @@ import java.util.concurrent.ConcurrentHashMap;
public abstract class ConversionHandler implements InvocationHandler, Serializable {
private final Object delegate;
private static final long serialVersionUID = 1162833717190835227L;
- private final ConcurrentHashMap<Method, Object> handleCache;
- {
- if (VMPluginFactory.getPlugin().getVersion() >= 7) {
- handleCache = new ConcurrentHashMap<Method, Object>(16, 0.9f, 2);
- } else {
- handleCache = null;
- }
- }
-
+ private final ConcurrentHashMap<Method, Object> handleCache = new ConcurrentHashMap<>(16, 0.9f, 2);
private MetaClass metaClass;
/**