You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2016/06/18 07:03:06 UTC
[1/3] hadoop git commit: Revert "HADOOP-12718. Incorrect error
message by fs -put local dir without permission. (John Zhuge via Yongjun
Zhang)"
Repository: hadoop
Updated Branches:
refs/heads/branch-2 25be8105c -> b726b5c52
refs/heads/branch-2.8 3f2d2cd0a -> 55658dcaa
refs/heads/trunk 20f279993 -> 5f6bc65bb
Revert "HADOOP-12718. Incorrect error message by fs -put local dir without permission. (John Zhuge via Yongjun Zhang)"
This reverts commit 97056c3355810a803f07baca89b89e2bf6bb7201.
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f6bc65b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f6bc65b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f6bc65b
Branch: refs/heads/trunk
Commit: 5f6bc65bb31270f2b5dfdfd941a0568fc1f3337f
Parents: 20f2799
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Jun 17 23:50:22 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Jun 17 23:50:22 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f6bc65b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
index 8ef8392..cc41f4a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
@@ -33,7 +33,6 @@ import java.io.OutputStream;
import java.io.FileDescriptor;
import java.net.URI;
import java.nio.ByteBuffer;
-import java.nio.file.AccessDeniedException;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.attribute.BasicFileAttributes;
@@ -472,10 +471,6 @@ public class RawLocalFileSystem extends FileSystem {
if (localf.isDirectory()) {
String[] names = localf.list();
if (names == null) {
- if (!localf.canRead()) {
- throw new AccessDeniedException("cannot open directory " + f +
- ": Permission denied");
- }
return null;
}
results = new FileStatus[names.length];
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/3] hadoop git commit: Revert "HADOOP-12718. Incorrect error
message by fs -put local dir without permission. (John Zhuge via Yongjun
Zhang)"
Posted by cn...@apache.org.
Revert "HADOOP-12718. Incorrect error message by fs -put local dir without permission. (John Zhuge via Yongjun Zhang)"
This reverts commit 62206dd2edcc53dbfbae30a524c21e7eb828bd0e.
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55658dca
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55658dca
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55658dca
Branch: refs/heads/branch-2.8
Commit: 55658dcaa3b9389093784148e7b9ecc83720a5b0
Parents: 3f2d2cd
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Jun 17 23:51:27 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Jun 17 23:51:27 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/55658dca/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
index 7e6a266..fc6a91a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
@@ -33,7 +33,6 @@ import java.io.OutputStream;
import java.io.FileDescriptor;
import java.net.URI;
import java.nio.ByteBuffer;
-import java.nio.file.AccessDeniedException;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.attribute.BasicFileAttributes;
@@ -459,10 +458,6 @@ public class RawLocalFileSystem extends FileSystem {
if (localf.isDirectory()) {
String[] names = localf.list();
if (names == null) {
- if (!localf.canRead()) {
- throw new AccessDeniedException("cannot open directory " + f +
- ": Permission denied");
- }
return null;
}
results = new FileStatus[names.length];
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/3] hadoop git commit: Revert "HADOOP-12718. Incorrect error
message by fs -put local dir without permission. (John Zhuge via Yongjun
Zhang)"
Posted by cn...@apache.org.
Revert "HADOOP-12718. Incorrect error message by fs -put local dir without permission. (John Zhuge via Yongjun Zhang)"
This reverts commit a1f913fb6e917f90d9492c78a30b380096ddb3db.
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b726b5c5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b726b5c5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b726b5c5
Branch: refs/heads/branch-2
Commit: b726b5c52c3e84236fdd1af8add584c974895f88
Parents: 25be810
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Jun 17 23:50:55 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Jun 17 23:50:55 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b726b5c5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
index 7e6a266..fc6a91a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
@@ -33,7 +33,6 @@ import java.io.OutputStream;
import java.io.FileDescriptor;
import java.net.URI;
import java.nio.ByteBuffer;
-import java.nio.file.AccessDeniedException;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.attribute.BasicFileAttributes;
@@ -459,10 +458,6 @@ public class RawLocalFileSystem extends FileSystem {
if (localf.isDirectory()) {
String[] names = localf.list();
if (names == null) {
- if (!localf.canRead()) {
- throw new AccessDeniedException("cannot open directory " + f +
- ": Permission denied");
- }
return null;
}
results = new FileStatus[names.length];
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org