diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index 7ba3b6e3b..36214df57 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -1109,32 +1109,31 @@ private static String getCanonicalName(String className) {
         className = StringUtils.deleteWhitespace(className);
         if (className == null) {
             return null;
+        }
+        int dim = 0;
+        while (className.startsWith("[")) {
+            dim++;
+            className = className.substring(1);
+        }
+        if (dim < 1) {
+            return className;
         } else {
-            int dim = 0;
-            while (className.startsWith("[")) {
-                dim++;
-                className = className.substring(1);
-            }
-            if (dim < 1) {
-                return className;
+            if (className.startsWith("L")) {
+                className = className.substring(
+                    1,
+                    className.endsWith(";")
+                        ? className.length() - 1
+                        : className.length());
             } else {
-                if (className.startsWith("L")) {
-                    className = className.substring(
-                        1,
-                        className.endsWith(";")
-                            ? className.length() - 1
-                            : className.length());
-                } else {
-                    if (className.length() > 0) {
-                        className = reverseAbbreviationMap.get(className.substring(0, 1));
-                    }
+                if (className.length() > 0) {
+                    className = reverseAbbreviationMap.get(className.substring(0, 1));
                 }
-                final StringBuilder canonicalClassNameBuffer = new StringBuilder(className);
-                for (int i = 0; i < dim; i++) {
-                    canonicalClassNameBuffer.append("[]");
-                }
-                return canonicalClassNameBuffer.toString();
             }
+            final StringBuilder canonicalClassNameBuffer = new StringBuilder(className);
+            for (int i = 0; i < dim; i++) {
+                canonicalClassNameBuffer.append("[]");
+            }
+            return canonicalClassNameBuffer.toString();
         }
     }