HADOOP-18301. Upgrade commons-io to 2.11.0 (#4455)
Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com>
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HostRestrictingAuthorizationFilter.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HostRestrictingAuthorizationFilter.java
index e9f1cf0..0308e55 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HostRestrictingAuthorizationFilter.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HostRestrictingAuthorizationFilter.java
@@ -117,17 +117,12 @@
String rulePath = rule.getPath();
LOG.trace("Evaluating rule, subnet: {}, path: {}",
subnet != null ? subnet.getCidrSignature() : "*", rulePath);
- try {
- if ((subnet == null || subnet.isInRange(remoteIp))
- && FilenameUtils.directoryContains(rulePath, path)) {
- LOG.debug("Found matching rule, subnet: {}, path: {}; returned true",
- rule.getSubnet() != null ? subnet.getCidrSignature() : null,
- rulePath);
- return true;
- }
- } catch (IOException e) {
- LOG.warn("Got IOException {}; returned false", e);
- return false;
+ if ((subnet == null || subnet.isInRange(remoteIp))
+ && FilenameUtils.directoryContains(rulePath, path)) {
+ LOG.debug("Found matching rule, subnet: {}, path: {}; returned true",
+ rule.getSubnet() != null ? subnet.getCidrSignature() : null,
+ rulePath);
+ return true;
}
}
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index ef479cc..0f01726 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -118,7 +118,7 @@
<commons-collections.version>3.2.2</commons-collections.version>
<commons-compress.version>1.21</commons-compress.version>
<commons-csv.version>1.0</commons-csv.version>
- <commons-io.version>2.8.0</commons-io.version>
+ <commons-io.version>2.11.0</commons-io.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-logging.version>1.1.3</commons-logging.version>
<commons-logging-api.version>1.1</commons-logging-api.version>
