HADOOP-17858. Avoid possible class loading deadlock with VerifierNone initialization (#3321)
This commit is contained in:
parent
e06a5cb197
commit
fc566ad9b0
|
@ -28,7 +28,6 @@ import io.netty.channel.ChannelHandlerContext;
|
|||
import io.netty.channel.ChannelInboundHandlerAdapter;
|
||||
import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
|
||||
import org.apache.hadoop.oncrpc.RpcAcceptedReply.AcceptState;
|
||||
import org.apache.hadoop.oncrpc.security.Verifier;
|
||||
import org.apache.hadoop.oncrpc.security.VerifierNone;
|
||||
import org.apache.hadoop.portmap.PortmapMapping;
|
||||
import org.apache.hadoop.portmap.PortmapRequest;
|
||||
|
@ -213,7 +212,7 @@ public abstract class RpcProgram extends ChannelInboundHandlerAdapter {
|
|||
private void sendAcceptedReply(RpcCall call, SocketAddress remoteAddress,
|
||||
AcceptState acceptState, ChannelHandlerContext ctx) {
|
||||
RpcAcceptedReply reply = RpcAcceptedReply.getInstance(call.getXid(),
|
||||
acceptState, Verifier.VERIFIER_NONE);
|
||||
acceptState, VerifierNone.INSTANCE);
|
||||
|
||||
XDR out = new XDR();
|
||||
reply.write(out);
|
||||
|
|
|
@ -27,8 +27,6 @@ import org.apache.hadoop.oncrpc.XDR;
|
|||
*/
|
||||
public abstract class Verifier extends RpcAuthInfo {
|
||||
|
||||
public static final Verifier VERIFIER_NONE = new VerifierNone();
|
||||
|
||||
protected Verifier(AuthFlavor flavor) {
|
||||
super(flavor);
|
||||
}
|
||||
|
|
|
@ -24,6 +24,8 @@ import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
|
|||
/** Verifier used by AUTH_NONE. */
|
||||
public class VerifierNone extends Verifier {
|
||||
|
||||
public static final Verifier INSTANCE = new VerifierNone();
|
||||
|
||||
public VerifierNone() {
|
||||
super(AuthFlavor.AUTH_NONE);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue