check null for path before call rest server (#3665)

5e6cbbe5 · ken.lj · Ian Luo · 70898ef7 · 5e6cbbe5
隐藏空白更改
内联并排

Showing with 9 addition and 5 deletion

dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java ...java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java +9 -5

未找到文件。
--- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
@@ -237,13 +237,17 @@ public class RestProtocol extends AbstractProxyProtocol {
     */
    protected String getContextPath(URL url) {
        String contextPath = url.getPath();
-        if (contextPath.equalsIgnoreCase(url.getParameter(Constants.INTERFACE_KEY))) {
+        if (contextPath != null) {
+            if (contextPath.equalsIgnoreCase(url.getParameter(Constants.INTERFACE_KEY))) {
+                return "";
+            }
+            if (contextPath.endsWith(url.getParameter(Constants.INTERFACE_KEY))) {
+                contextPath = contextPath.substring(0, contextPath.lastIndexOf(url.getParameter(Constants.INTERFACE_KEY)));
+            }
+            return contextPath.endsWith("/") ? contextPath.substring(0, contextPath.length() - 1) : contextPath;
+        } else {
            return "";
        }
-        if (contextPath.endsWith(url.getParameter(Constants.INTERFACE_KEY))) {
-            contextPath = contextPath.substring(0, contextPath.lastIndexOf(url.getParameter(Constants.INTERFACE_KEY)));
-        }
-        return contextPath.endsWith("/") ? contextPath.substring(0, contextPath.length() - 1) : contextPath;
    }

    protected class ConnectionMonitor extends Thread {