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

Merge -r 1355592:1355593 from trunk to branch. FIXES: HDFS-3580 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355595 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-06-29 22:59:09 +00:00
parent 535fd7de15
commit b51d32719d
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
View File

@ -404,7 +404,7 @@ public class HttpFSServer {
String doAs = params.get(DoAsParam.NAME, DoAsParam.class); String doAs = params.get(DoAsParam.NAME, DoAsParam.class);
switch (op.value()) { switch (op.value()) {
case APPEND: { case APPEND: {
boolean hasData = params.get(DataParam.NAME, DataParam.class); Boolean hasData = params.get(DataParam.NAME, DataParam.class);
if (!hasData) { if (!hasData) {
response = Response.temporaryRedirect( response = Response.temporaryRedirect(
createUploadRedirectionURL(uriInfo, createUploadRedirectionURL(uriInfo,
@ -478,7 +478,7 @@ public class HttpFSServer {
String doAs = params.get(DoAsParam.NAME, DoAsParam.class); String doAs = params.get(DoAsParam.NAME, DoAsParam.class);
switch (op.value()) { switch (op.value()) {
case CREATE: { case CREATE: {
boolean hasData = params.get(DataParam.NAME, DataParam.class); Boolean hasData = params.get(DataParam.NAME, DataParam.class);
if (!hasData) { if (!hasData) {
response = Response.temporaryRedirect( response = Response.temporaryRedirect(
createUploadRedirectionURL(uriInfo, createUploadRedirectionURL(uriInfo,
@ -486,11 +486,11 @@ public class HttpFSServer {
} else { } else {
Short permission = params.get(PermissionParam.NAME, Short permission = params.get(PermissionParam.NAME,
PermissionParam.class); PermissionParam.class);
boolean override = params.get(OverwriteParam.NAME, Boolean override = params.get(OverwriteParam.NAME,
OverwriteParam.class); OverwriteParam.class);
short replication = params.get(ReplicationParam.NAME, Short replication = params.get(ReplicationParam.NAME,
ReplicationParam.class); ReplicationParam.class);
long blockSize = params.get(BlockSizeParam.NAME, Long blockSize = params.get(BlockSizeParam.NAME,
BlockSizeParam.class); BlockSizeParam.class);
FSOperations.FSCreate command = FSOperations.FSCreate command =
new FSOperations.FSCreate(is, path, permission, override, new FSOperations.FSCreate(is, path, permission, override,
@ -543,7 +543,7 @@ public class HttpFSServer {
break; break;
} }
case SETREPLICATION: { case SETREPLICATION: {
short replication = params.get(ReplicationParam.NAME, Short replication = params.get(ReplicationParam.NAME,
ReplicationParam.class); ReplicationParam.class);
FSOperations.FSSetReplication command = FSOperations.FSSetReplication command =
new FSOperations.FSSetReplication(path, replication); new FSOperations.FSSetReplication(path, replication);
@ -553,9 +553,9 @@ public class HttpFSServer {
break; break;
} }
case SETTIMES: { case SETTIMES: {
long modifiedTime = params.get(ModifiedTimeParam.NAME, Long modifiedTime = params.get(ModifiedTimeParam.NAME,
ModifiedTimeParam.class); ModifiedTimeParam.class);
long accessTime = params.get(AccessTimeParam.NAME, Long accessTime = params.get(AccessTimeParam.NAME,
AccessTimeParam.class); AccessTimeParam.class);
FSOperations.FSSetTimes command = FSOperations.FSSetTimes command =
new FSOperations.FSSetTimes(path, modifiedTime, accessTime); new FSOperations.FSSetTimes(path, modifiedTime, accessTime);

4
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -261,6 +261,10 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3491. HttpFs does not set permissions correctly (tucu) HDFS-3491. HttpFs does not set permissions correctly (tucu)
HDFS-3580. incompatible types; no instance(s) of type variable(s) V exist
so that V conforms to boolean compiling HttpFSServer.java with OpenJDK
(adi2 via tucu)
Release 2.0.0-alpha - 05-23-2012 Release 2.0.0-alpha - 05-23-2012
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES