Repository: hadoop Updated Branches: refs/heads/branch-2 5305a392c -> f131d61ff
HADOOP-13700. Remove unthrown IOException from TrashPolicy#initialize and #getInstance signatures. (cherry picked from commit 12d739a34ba868b3f7f5adf7f37a60d4aca9061b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f131d61f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f131d61f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f131d61f Branch: refs/heads/branch-2 Commit: f131d61ff8bc87e74c67fec3ae2b50ee50dd0d2c Parents: 5305a39 Author: Andrew Wang <w...@apache.org> Authored: Wed Oct 12 15:19:52 2016 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Wed Oct 12 15:20:07 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/TrashPolicy.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f131d61f/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java index 157b9ab..2fe3fd1 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java @@ -53,9 +53,8 @@ public abstract class TrashPolicy extends Configured { * not assume trash always under /user/$USER due to HDFS encryption zone. * @param conf the configuration to be used * @param fs the filesystem to be used - * @throws IOException */ - public void initialize(Configuration conf, FileSystem fs) throws IOException{ + public void initialize(Configuration conf, FileSystem fs) { throw new UnsupportedOperationException(); } @@ -137,8 +136,7 @@ public abstract class TrashPolicy extends Configured { * @param fs the file system to be used * @return an instance of TrashPolicy */ - public static TrashPolicy getInstance(Configuration conf, FileSystem fs) - throws IOException { + public static TrashPolicy getInstance(Configuration conf, FileSystem fs) { Class<? extends TrashPolicy> trashClass = conf.getClass( "fs.trash.classname", TrashPolicyDefault.class, TrashPolicy.class); TrashPolicy trash = ReflectionUtils.newInstance(trashClass, conf); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
