SAK-30890 - /direct results in an error page (sakaiproject#2291)

chundcm · Apr 21, 2016 · 4dab292 · 4dab292
1 parent de796a7
commit 4dab292
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/servlet/DirectServlet.java b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/servlet/DirectServlet.java
@@ -146,12 +146,16 @@ protected void service(HttpServletRequest req, HttpServletResponse res)
     protected void handleRequest(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
         // catch the login helper posts
-        String option = req.getPathInfo();
-        String[] parts = option.split("/");
-        if ((parts.length == 2) && ((parts[1].equals("login")))) {
-            handleUserLogin(req, res, null);
-        } else {
-            dispatch(req, res);
+        // Note that with wrapped requests, URLUtils.getSafePathInfo may return null
+        // so we use the request URI
+        String uri = req.getRequestURI();
+        if ( uri != null ) {
+            String[] parts = uri.split("/");
+            if ((parts.length == 2) && ((parts[1].equals("login")))) {
+                handleUserLogin(req, res, null);
+            } else {
+                dispatch(req, res);
+            }
         }
     }