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 2020/03/28 04:40:48 UTC

[groovy] branch danielsun/address-github-actions-errors updated: Try to fix the failing build - 6

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch danielsun/address-github-actions-errors
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/danielsun/address-github-actions-errors by this push:
     new 3168c54  Try to fix the failing build - 6
3168c54 is described below

commit 3168c546813ba7e46595d03ed437dd321a6f503c
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Mar 28 12:40:13 2020 +0800

    Try to fix the failing build - 6
---
 src/main/java/groovy/lang/MetaClassImpl.java       |  2 +-
 .../org/codehaus/groovy/reflection/ClassInfo.java  | 25 ++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 1df405a..0d5c26b 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -3131,7 +3131,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
         }
     }
 
-    protected boolean isInitialized() {
+    public boolean isInitialized() {
         return initialized;
     }
 
diff --git a/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java b/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java
index 77b2c5f..ee71e75 100644
--- a/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java
+++ b/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java
@@ -23,8 +23,10 @@ import groovy.lang.ExpandoMetaClass;
 import groovy.lang.ExpandoMetaClassCreationHandle;
 import groovy.lang.GroovySystem;
 import groovy.lang.MetaClass;
+import groovy.lang.MetaClassImpl;
 import groovy.lang.MetaClassRegistry;
 import groovy.lang.MetaMethod;
+import org.codehaus.groovy.GroovyBugError;
 import org.codehaus.groovy.reflection.GroovyClassValue.ComputeValue;
 import org.codehaus.groovy.reflection.stdclasses.ArrayCachedClass;
 import org.codehaus.groovy.reflection.stdclasses.BigDecimalCachedClass;
@@ -273,13 +275,22 @@ public class ClassInfo implements Finalizable {
 
     private MetaClass getMetaClassUnderLock() {
         MetaClass answer = getStrongMetaClass();
-        if (answer!=null) return answer;
+        if (answer!=null) {
+            if (answer instanceof MetaClassImpl && !((MetaClassImpl) answer).isInitialized()) {
+                throw new GroovyBugError("2: " + answer);
+            }
+            return answer;
+        }
 
         answer = getWeakMetaClass();
         final MetaClassRegistry metaClassRegistry = GroovySystem.getMetaClassRegistry();
         MetaClassRegistry.MetaClassCreationHandle mccHandle = metaClassRegistry.getMetaClassCreationHandler();
 
         if (isValidWeakMetaClass(answer, mccHandle)) {
+            if (answer instanceof MetaClassImpl && !((MetaClassImpl) answer).isInitialized()) {
+                throw new GroovyBugError("3: " + answer);
+            }
+
             return answer;
         }
 
@@ -291,6 +302,11 @@ public class ClassInfo implements Finalizable {
         } else {
             setWeakMetaClass(answer);
         }
+
+        if (answer instanceof MetaClassImpl && !((MetaClassImpl) answer).isInitialized()) {
+            throw new GroovyBugError("1: " + answer);
+        }
+
         return answer;
     }
 
@@ -322,7 +338,12 @@ public class ClassInfo implements Finalizable {
      */
     public final MetaClass getMetaClass() {
         MetaClass answer = getMetaClassForClass();
-        if (answer != null) return answer;
+        if (answer != null) {
+            if (answer instanceof MetaClassImpl && !((MetaClassImpl) answer).isInitialized()) {
+                throw new GroovyBugError("1: " + answer);
+            }
+            return answer;
+        }
 
         lock();
         try {