Fix incorrect null check - SIDP-277

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2835 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index aefd370..dac705d 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -2,6 +2,7 @@ Changes in Release 2.1.3
 =============================================
 [SIDP-247] - Log Exception in UP LoginHandler Servlet
 [SIDP-276] - Example RDB Connector, quote principal
+[SIDP-277] - Incorrect null check for request context in UsernamePasswordServlet
 [SIDP-280] - when an Idp has no outside (WAN) access Idp fails to collect or release attributes
 
 Changes in Release 2.1.2

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java
index 73a4c33..03bb560 100644 (file)
--- a/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java
+++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java
@@ -126,7 +126,7 @@ public class UsernamePasswordLoginServlet extends HttpServlet {
             List<Pair<String, String>> queryParams) {
        
         String requestContext = DatatypeHelper.safeTrimOrNullString(request.getContextPath());
-        if(request == null){
+        if(requestContext == null){
             requestContext = "/";
         }
         request.setAttribute("actionUrl", requestContext + request.getServletPath());