Minor refactoring

(cherry picked from commit 010624d)
apache · Aug 26, 2017 · b82049a · b82049a
1 parent df0dfbf
commit b82049a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/groovy/lang/GroovyObjectSupport.java b/src/main/groovy/lang/GroovyObjectSupport.java
@@ -31,7 +31,7 @@ public abstract class GroovyObjectSupport implements GroovyObject {
     private transient MetaClass metaClass;
 
     public GroovyObjectSupport() {
-        this.metaClass = InvokerHelper.getMetaClass(this.getClass());
+        this.metaClass = getDefaultMetaClass();
     }
 
     public Object getProperty(String property) {
@@ -47,13 +47,17 @@ public Object invokeMethod(String name, Object args) {
     }
 
     public MetaClass getMetaClass() {
-        if (metaClass == null) {
-            metaClass = InvokerHelper.getMetaClass(getClass());
-        }
-        return metaClass;
+        return this.metaClass;
     }
 
     public void setMetaClass(MetaClass metaClass) {
-        this.metaClass = metaClass;
+        this.metaClass =
+                null == metaClass
+                    ? getDefaultMetaClass()
+                    : metaClass;
+    }
+
+    private MetaClass getDefaultMetaClass() {
+        return InvokerHelper.getMetaClass(this.getClass());
     }
 }