Prevented NPE if using Redirector.MODE_SERVER_INBOUND. Issue restlet#1182.

Author: thboileau

build/tmpl/text/changes.txt

@@ -10,6 +10,7 @@ Changes log
        - Fixed StatusService.toStatus(Status, Request, Response) is not called. Issue #1156.
        - Fixed issue with case sensitivity of query parameters with JAX-RS. Issue #1163.
        - Fixed method value caching broken. Issue #1130.
+       - Prevented NPE if using Redirector.MODE_SERVER_INBOUND. Issue #1182.
     - Enhancements
        - Upgraded Jetty connector to version 9.2.14. Issue #1180.
 

modules/org.restlet/src/org/restlet/engine/component/HostRoute.java

@@ -159,12 +159,15 @@ public float score(Request request, Response response) {
 
             int resourcePortValue = request.getResourceRef().getHostPort();
 
-            if (resourcePortValue == -1) {
+            if (resourcePortValue == -1
+                    && request.getResourceRef()
+                            .getSchemeProtocol() != null) {
                 resourcePortValue = request.getResourceRef()
                         .getSchemeProtocol().getDefaultPort();
             }
 
-            String resourcePort = Integer.toString(resourcePortValue);
+            String resourcePort = (resourcePortValue == -1) ? "" : Integer.toString(resourcePortValue);
+
             String resourceScheme = request.getResourceRef().getScheme();
 
             if (resourceScheme == null) {
@@ -190,13 +193,10 @@ public float score(Request request, Response response) {
             if (matches(getVirtualHost().getHostDomain(), hostDomain)
                     && matches(getVirtualHost().getHostPort(), hostPort)
                     && matches(getVirtualHost().getHostScheme(), hostScheme)
-                    && matches(getVirtualHost().getResourceDomain(),
-                            resourceDomain)
+                    && matches(getVirtualHost().getResourceDomain(), resourceDomain)
                     && matches(getVirtualHost().getResourcePort(), resourcePort)
-                    && matches(getVirtualHost().getResourceScheme(),
-                            resourceScheme)
-                    && matches(getVirtualHost().getServerAddress(),
-                            serverAddress)
+                    && matches(getVirtualHost().getResourceScheme(), resourceScheme)
+                    && matches(getVirtualHost().getServerAddress(), serverAddress)
                     && matches(getVirtualHost().getServerPort(), serverPort)) {
                 result = 1F;
             }