diff --git a/LICENSE-binary b/LICENSE-binary index 5af4b60f6cf01..be1b797452f7d 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -249,7 +249,7 @@ commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.11 commons-collections:commons-collections:3.2.2 commons-daemon:commons-daemon:1.0.13 -commons-io:commons-io:2.5 +commons-io:commons-io:2.8.0 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.1.3 commons-net:commons-net:3.6 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java index e078a2c519621..63cbd6212b322 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java @@ -604,18 +604,12 @@ public static long getDU(File dir) { return dir.length(); } else { File[] allFiles = dir.listFiles(); - if(allFiles != null) { - for (int i = 0; i < allFiles.length; i++) { - boolean isSymLink; - try { - isSymLink = org.apache.commons.io.FileUtils.isSymlink(allFiles[i]); - } catch(IOException ioe) { - isSymLink = true; - } - if(!isSymLink) { - size += getDU(allFiles[i]); - } - } + if (allFiles != null) { + for (File f : allFiles) { + if (!org.apache.commons.io.FileUtils.isSymlink(f)) { + size += getDU(f); + } + } } return size; } diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 99e39a3e490c8..920e7d208bc26 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -119,7 +119,7 @@ 3.2.2 1.19 1.0 - 2.5 + 2.8.0 3.7 1.1.3 1.1