Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public String getMechanismName() {
@Override
public void evaluateRequest(final HttpServerRequest request) throws HttpAuthenticationException {
// Is current request an authentication attempt?
if (POST.equals(request.getRequestMethod()) && isAuthenticationRequest(request.getRequestURI().getPath())) {
if (POST.equals(request.getRequestMethod()) && request.getRequestURI() != null && isAuthenticationRequest(request.getRequestURI().getPath())) {
attemptAuthentication(request);
return;
}
Expand Down Expand Up @@ -327,7 +327,7 @@ private void sendLogin(HttpServerRequest request, HttpServerResponse response) t
// Save the current request.
URI requestURI = request.getRequestURI();
HttpScope session = getSessionScope(request, true);
if (session != null && session.supportsAttachments()) {
if (session != null && session.supportsAttachments() && requestURI != null) {
StringBuilder sb = new StringBuilder();
String scheme = requestURI.getScheme();
sb.append(scheme);
Expand Down