Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert HADOOP-11356 in branch-2.

This commit is contained in:
Haohui Mai 2014-12-16 13:21:58 -08:00
parent 1b91a6d011
commit ba0969fb0e
3 changed files with 68 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -46,9 +46,6 @@ 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)
HADOOP-11313. Adding a document about NativeLibraryChecker.
(Tsuyoshi OZAWA via cnauroth)

66
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java Normal file
View File

@ -0,0 +1,66 @@
/**
* 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
@InterfaceAudience.Public
@InterfaceStability.Stable
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);
}
}

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java
View File

@ -17,7 +17,6 @@
*/
package org.apache.hadoop.security;
import java.io.IOException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@ -26,7 +25,8 @@ import org.apache.hadoop.classification.InterfaceStability;
*/
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
@InterfaceStability.Evolving
public class AccessControlException extends IOException {
public class AccessControlException
extends org.apache.hadoop.fs.permission.AccessControlException {
//Required by {@link java.io.Serializable}.
private static final long serialVersionUID = 1L;