diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java index d3c2d15..dd254ab 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java @@ -192,16 +192,19 @@ protected void serviceInit(Configuration conf) throws Exception { String auth = conf.getTrimmed(KEY_REGISTRY_CLIENT_AUTH, REGISTRY_CLIENT_AUTH_ANONYMOUS); - // TODO JDK7 SWITCH - if (REGISTRY_CLIENT_AUTH_KERBEROS.equals(auth)) { + switch (auth) { + case REGISTRY_CLIENT_AUTH_KERBEROS: access = AccessPolicy.sasl; - } else if (REGISTRY_CLIENT_AUTH_DIGEST.equals(auth)) { + break; + case REGISTRY_CLIENT_AUTH_DIGEST: access = AccessPolicy.digest; - } else if (REGISTRY_CLIENT_AUTH_ANONYMOUS.equals(auth)) { + break; + case REGISTRY_CLIENT_AUTH_ANONYMOUS: access = AccessPolicy.anon; - } else { + break; + default: throw new ServiceStateException(E_UNKNOWN_AUTHENTICATION_MECHANISM - + "\"" + auth + "\""); + + "\"" + auth + "\""); } initSecurity(); }