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 06:54:42 UTC

[groovy] branch danielsun1106/address-github-actions-errors-2 created (now 1888f44)

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

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


      at 1888f44  Try to fix the failing build

This branch includes the following new commits:

     new 1888f44  Try to fix the failing build

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[groovy] 01/01: Try to fix the failing build

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1888f445682b6684e39e7cf577bee827ac99e9a0
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Mar 28 14:49:21 2020 +0800

    Try to fix the failing build
---
 src/main/java/groovy/lang/ExpandoMetaClass.java    |  6 ++++--
 src/main/java/groovy/lang/MetaClassImpl.java       |  9 ++++++--
 .../org/codehaus/groovy/reflection/ClassInfo.java  | 25 ++++++++++++++++++++--
 .../groovy/runtime/metaclass/ClosureMetaClass.java |  8 ++++++-
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/main/java/groovy/lang/ExpandoMetaClass.java b/src/main/java/groovy/lang/ExpandoMetaClass.java
index 3ecf073..2db6e41 100644
--- a/src/main/java/groovy/lang/ExpandoMetaClass.java
+++ b/src/main/java/groovy/lang/ExpandoMetaClass.java
@@ -272,7 +272,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject {
     // These two properties are used when no ExpandoMetaClassCreationHandle is present
 
     private MetaClass myMetaClass;
-    private boolean initialized;
+    private volatile boolean initialized;
     private volatile boolean modified;
 
     private boolean initCalled;
@@ -502,7 +502,8 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject {
      * Checks if the meta class is initialized.
      * @see groovy.lang.MetaClassImpl#isInitialized()
      */
-    protected boolean isInitialized() {
+    @Override
+    public boolean isInitialized() {
         try {
             readLock.lock();
             return this.initialized;
@@ -511,6 +512,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject {
         }
     }
 
+    @Override
     protected void setInitialized(boolean b) {
         this.initialized = b;
     }
diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 141deab..0d5c26b 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -3131,10 +3131,14 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
         }
     }
 
-    protected boolean isInitialized() {
+    public boolean isInitialized() {
         return initialized;
     }
 
+    protected void setInitialized(boolean initialized) {
+        this.initialized = initialized;
+    }
+
     /**
      * @return {@code false}: add method
      *         {@code null} : ignore method
@@ -3391,7 +3395,8 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
                 // Introspection failure...
                 // May happen in Android
             }
-            initialized = true;
+
+            setInitialized(true);
         }
     }
 
diff --git a/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java b/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java
index 77b2c5f..cc43b2b 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("4: " + 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 {
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
index 786a0ba..51c2c58 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
@@ -575,10 +575,16 @@ public final class ClosureMetaClass extends MetaClassImpl {
         return null;
     }
 
-    protected boolean isInitialized() {
+    @Override
+    public boolean isInitialized() {
         return initialized;
     }
 
+    @Override
+    protected void setInitialized(boolean initialized) {
+        this.initialized = initialized;
+    }
+
     public MetaMethod getStaticMetaMethod(String name, Object[] args) {
         return CLOSURE_METACLASS.getStaticMetaMethod(name, args);
     }