Repository: flink Updated Branches: refs/heads/master 36b762e43 -> 1950d0568
[yarn-tests] Fix potential NullPointerException Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1950d056 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1950d056 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1950d056 Branch: refs/heads/master Commit: 1950d056856f7b84ca3b5906c12a33fa655d05e6 Parents: 36b762e Author: Robert Metzger <rmetz...@apache.org> Authored: Mon Mar 16 21:12:22 2015 +0100 Committer: Robert Metzger <rmetz...@apache.org> Committed: Mon Mar 16 21:12:22 2015 +0100 ---------------------------------------------------------------------- .../org/apache/flink/yarn/YarnTestBase.java | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/1950d056/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java ---------------------------------------------------------------------- diff --git a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java index 88b4772..55806ad 100644 --- a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java +++ b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java @@ -251,24 +251,24 @@ public abstract class YarnTestBase { File foundFile = findFile(cwd.getAbsolutePath(), new FilenameFilter() { @Override public boolean accept(File dir, String name) { + // scan each file for prohibited strings. File f = new File(dir.getAbsolutePath()+ "/" + name); - // scan each file for 'Exception'. - Scanner scanner = null; try { - scanner = new Scanner(f); + Scanner scanner = new Scanner(f); + while (scanner.hasNextLine()) { + final String lineFromFile = scanner.nextLine(); + for (String aProhibited : prohibited) { + if (lineFromFile.contains(aProhibited)) { + LOG.warn("Prohibited String '{}' in line '{}'", aProhibited, lineFromFile); + return true; + } + } + + } } catch (FileNotFoundException e) { LOG.warn("Unable to locate file: "+e.getMessage()+" file: "+f.getAbsolutePath()); } - while (scanner.hasNextLine()) { - final String lineFromFile = scanner.nextLine(); - for(int i = 0; i < prohibited.length; i++) { - if(lineFromFile.contains(prohibited[i])) { - LOG.warn("Prohibited String '{}' in line '{}'", prohibited[i], lineFromFile); - return true; - } - } - } return false; } });
