Merge pull request Netflix#57 from pmotyka/1.x

check if query string is null before string concatenation
sanjeevgour · Apr 22, 2015 · dab12e3 · dab12e3
2 parents aac4547 + 0adbea8
commit dab12e3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/zuul-simple-webapp/src/main/groovy/filters/route/SimpleHostRequest.groovy b/zuul-simple-webapp/src/main/groovy/filters/route/SimpleHostRequest.groovy
@@ -217,9 +217,9 @@ class SimpleHostRoutingFilter extends ZuulFilter {
             headers.each {
                 Debug.addRequestDebug("ZUUL::> ${it.name}  ${it.value}")
             }
-            String query = request.queryString
+            String query = request.queryString != null ? "?" + request.queryString : ""
 
-            Debug.addRequestDebug("ZUUL:: > ${verb}  ${uri}?${query} HTTP/1.1")
+            Debug.addRequestDebug("ZUUL:: > ${verb}  ${uri}${query} HTTP/1.1")
             if (requestEntity != null) {
                 requestEntity = debugRequestEntity(requestEntity)
             }