Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java (revision 1506743) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java (working copy) @@ -216,16 +216,11 @@ applicationId).getMaxAppAttempts())); Credentials credentials = new Credentials(); - - if (UserGroupInformation.isSecurityEnabled()) { - // TODO: Security enabled/disabled info should come from RM. - - DataInputByteBuffer dibb = new DataInputByteBuffer(); - if (container.getTokens() != null) { - // TODO: Don't do this kind of checks everywhere. - dibb.reset(container.getTokens()); - credentials.readTokenStorageStream(dibb); - } + DataInputByteBuffer dibb = new DataInputByteBuffer(); + if (container.getTokens() != null) { + // TODO: Don't do this kind of checks everywhere. + dibb.reset(container.getTokens()); + credentials.readTokenStorageStream(dibb); } // Add AMRMToken