Repository: hadoop Updated Branches: refs/heads/trunk 0653918da -> 2829b7a96
HADOOP-11356. Removed deprecated o.a.h.fs.permission.AccessControlException. Contributed by Li Lu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2829b7a9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2829b7a9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2829b7a9 Branch: refs/heads/trunk Commit: 2829b7a96ffe6d2ca5e81689c7957e4e97042f2d Parents: 0653918 Author: Haohui Mai <[email protected]> Authored: Fri Dec 5 10:49:43 2014 -0800 Committer: Haohui Mai <[email protected]> Committed: Fri Dec 5 10:49:43 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 + .../fs/permission/AccessControlException.java | 66 -------------------- .../hadoop/security/AccessControlException.java | 4 +- 3 files changed, 5 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2829b7a9/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f2a086e..2f88fc8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -410,6 +410,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11301. [optionally] update jmx cache to drop old metrics (Maysam Yabandeh via stack) + HADOOP-11356. Removed deprecated o.a.h.fs.permission.AccessControlException. + (Li Lu via wheat9) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. http://git-wip-us.apache.org/repos/asf/hadoop/blob/2829b7a9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java deleted file mode 100644 index 1cd6395..0000000 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.fs.permission; - -import java.io.IOException; - -import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; - -/** - * An exception class for access control related issues. - * @deprecated Use {@link org.apache.hadoop.security.AccessControlException} - * instead. - */ -@Deprecated [email protected] [email protected] -public class AccessControlException extends IOException { - //Required by {@link java.io.Serializable}. - private static final long serialVersionUID = 1L; - - /** - * Default constructor is needed for unwrapping from - * {@link org.apache.hadoop.ipc.RemoteException}. - */ - public AccessControlException() { - super("Permission denied."); - } - - /** - * Constructs an {@link AccessControlException} - * with the specified detail message. - * @param s the detail message. - */ - public AccessControlException(String s) { - super(s); - } - - /** - * Constructs a new exception with the specified cause and a detail - * message of <tt>(cause==null ? null : cause.toString())</tt> (which - * typically contains the class and detail message of <tt>cause</tt>). - * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A <tt>null</tt> value is - * permitted, and indicates that the cause is nonexistent or - * unknown.) - */ - public AccessControlException(Throwable cause) { - super(cause); - } -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/2829b7a9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java index 5f0faa6..b1ab829 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.security; +import java.io.IOException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -25,8 +26,7 @@ import org.apache.hadoop.classification.InterfaceStability; */ @InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"}) @InterfaceStability.Evolving -public class AccessControlException - extends org.apache.hadoop.fs.permission.AccessControlException { +public class AccessControlException extends IOException { //Required by {@link java.io.Serializable}. private static final long serialVersionUID = 1L;
