[commons-lang] branch master updated: Avoid multiple equivalent occurrences of the same expression. (#797)

[ggregory]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git


The following commit(s) were added to refs/heads/master by this push:
     new e2e3e0e  Avoid multiple equivalent occurrences of the same expression. 
(#797)
e2e3e0e is described below

commit e2e3e0e19a8bdb6401d5f9a2c0193f1fa73565d3
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Tue Aug 31 15:06:34 2021 +0200

    Avoid multiple equivalent occurrences of the same expression. (#797)
---
 src/main/java/org/apache/commons/lang3/ClassUtils.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java 
b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index 08b4991..cd4fd69 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -1365,10 +1365,7 @@ public class ClassUtils {
             if (Float.TYPE.equals(cls)) {
                 return Double.TYPE.equals(toClass);
             }
-            if (Character.TYPE.equals(cls)) {
-                return Integer.TYPE.equals(toClass) || 
Long.TYPE.equals(toClass) || Float.TYPE.equals(toClass) || 
Double.TYPE.equals(toClass);
-            }
-            if (Short.TYPE.equals(cls)) {
+            if (Character.TYPE.equals(cls)  || Short.TYPE.equals(cls)) {
                 return Integer.TYPE.equals(toClass) || 
Long.TYPE.equals(toClass) || Float.TYPE.equals(toClass) || 
Double.TYPE.equals(toClass);
             }
             if (Byte.TYPE.equals(cls)) {