Skip to content

Commit 1110b03

Browse files
committed
HADOOP-17621. hadoop-auth to remove jetty-server dependency. (#2865)
Reviewed-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit dac60b8)
1 parent 4436524 commit 1110b03

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

hadoop-common-project/hadoop-auth/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,7 @@
193193
<artifactId>guava</artifactId>
194194
<scope>test</scope>
195195
</dependency>
196-
<dependency>
197-
<groupId>org.eclipse.jetty</groupId>
198-
<artifactId>jetty-server</artifactId>
199-
</dependency>
200-
</dependencies>
196+
</dependencies>
201197

202198
<build>
203199
<plugins>

hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationFilter.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.apache.hadoop.security.authentication.client.AuthenticationException;
2020
import org.apache.hadoop.security.authentication.client.KerberosAuthenticator;
2121
import org.apache.hadoop.security.authentication.util.*;
22-
import org.eclipse.jetty.server.Response;
2322
import org.slf4j.Logger;
2423
import org.slf4j.LoggerFactory;
2524

@@ -621,18 +620,15 @@ && getMaxInactiveInterval() > 0) {
621620
errCode = HttpServletResponse.SC_FORBIDDEN;
622621
}
623622
// After Jetty 9.4.21, sendError() no longer allows a custom message.
624-
// use setStatusWithReason() to set a custom message.
623+
// use setStatus() to set a custom message.
625624
String reason;
626625
if (authenticationEx == null) {
627626
reason = "Authentication required";
628627
} else {
629628
reason = authenticationEx.getMessage();
630629
}
631630

632-
if (httpResponse instanceof Response) {
633-
((Response)httpResponse).setStatusWithReason(errCode, reason);
634-
}
635-
631+
httpResponse.setStatus(errCode, reason);
636632
httpResponse.sendError(errCode, reason);
637633
}
638634
}

0 commit comments

Comments
 (0)