[groovy] branch master updated: Trivial refactoring: remove redundant check

[su...@apache.org]

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 e0ea05d  Trivial refactoring: remove redundant check
e0ea05d is described below

commit e0ea05de67fdd5fe55ce8dbf7c0e41cadc22b4be
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Nov 15 21:16:00 2020 +0800

    Trivial refactoring: remove redundant check
---
 src/main/java/groovy/lang/MetaClassImpl.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 7544d94..3a9dde4 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -2159,12 +2159,10 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
             }
         }
 
-        if (mp != null) {
-            if (mp instanceof MetaBeanProperty) {
-                MetaBeanProperty mbp = (MetaBeanProperty) mp;
-                method = mbp.getGetter();
-                mp = mbp.getField();
-            }
+        if (mp instanceof MetaBeanProperty) {
+            MetaBeanProperty mbp = (MetaBeanProperty) mp;
+            method = mbp.getGetter();
+            mp = mbp.getField();
         }
 
         // check for a category method named like a getter