[dubbo] branch 3.1 updated: [fix] remove some duplicate code (#10623)

[albumenj]

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

albumenj pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.1 by this push:
     new 3431d21ace [fix] remove some duplicate code (#10623)
3431d21ace is described below

commit 3431d21ace3845986851e02065cfd499b120acb4
Author: sunchaser-lilu <40930677+sunchaser-l...@users.noreply.github.com>
AuthorDate: Thu Sep 15 14:50:33 2022 +0800

    [fix] remove some duplicate code (#10623)
    
    * [fix] some statement can be simplified
    
    * [fix] remove some duplicate code
---
 .../dubbo/common/extension/ExtensionLoader.java    | 39 +++++++++-------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
index 474305c9bf..087d79256c 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
@@ -1075,30 +1075,23 @@ public class ExtensionLoader<T> {
             List<String> newContentList = getResourceContent(resourceURL);
             String clazz;
             for (String line : newContentList) {
-                final int ci = line.indexOf('#');
-                if (ci >= 0) {
-                    line = line.substring(0, ci);
-                }
-                line = line.trim();
-                if (line.length() > 0) {
-                    try {
-                        String name = null;
-                        int i = line.indexOf('=');
-                        if (i > 0) {
-                            name = line.substring(0, i).trim();
-                            clazz = line.substring(i + 1).trim();
-                        } else {
-                            clazz = line;
-                        }
-                        if (StringUtils.isNotEmpty(clazz) && 
!isExcluded(clazz, excludedPackages) && isIncluded(clazz, includedPackages)
-                            && !isExcludedByClassLoader(clazz, classLoader, 
onlyExtensionClassLoaderPackages)) {
-                            loadClass(extensionClasses, resourceURL, 
Class.forName(clazz, true, classLoader), name, overridden);
-                        }
-                    } catch (Throwable t) {
-                        IllegalStateException e = new 
IllegalStateException("Failed to load extension class (interface: " + type +
-                            ", class line: " + line + ") in " + resourceURL + 
", cause: " + t.getMessage(), t);
-                        exceptions.put(line, e);
+                try {
+                    String name = null;
+                    int i = line.indexOf('=');
+                    if (i > 0) {
+                        name = line.substring(0, i).trim();
+                        clazz = line.substring(i + 1).trim();
+                    } else {
+                        clazz = line;
+                    }
+                    if (StringUtils.isNotEmpty(clazz) && !isExcluded(clazz, 
excludedPackages) && isIncluded(clazz, includedPackages)
+                        && !isExcludedByClassLoader(clazz, classLoader, 
onlyExtensionClassLoaderPackages)) {
+                        loadClass(extensionClasses, resourceURL, 
Class.forName(clazz, true, classLoader), name, overridden);
                     }
+                } catch (Throwable t) {
+                    IllegalStateException e = new 
IllegalStateException("Failed to load extension class (interface: " + type +
+                        ", class line: " + line + ") in " + resourceURL + ", 
cause: " + t.getMessage(), t);
+                    exceptions.put(line, e);
                 }
             }
         } catch (Throwable t) {