You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by tu...@apache.org on 2012/06/30 00:59:10 UTC
svn commit: r1355595 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project:
hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
hadoop-hdfs/CHANGES.txt
Author: tucu
Date: Fri Jun 29 22:59:09 2012
New Revision: 1355595
URL: http://svn.apache.org/viewvc?rev=1355595&view=rev
Log:
Merge -r 1355592:1355593 from trunk to branch. FIXES: HDFS-3580
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java?rev=1355595&r1=1355594&r2=1355595&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java Fri Jun 29 22:59:09 2012
@@ -404,7 +404,7 @@ public class HttpFSServer {
String doAs = params.get(DoAsParam.NAME, DoAsParam.class);
switch (op.value()) {
case APPEND: {
- boolean hasData = params.get(DataParam.NAME, DataParam.class);
+ Boolean hasData = params.get(DataParam.NAME, DataParam.class);
if (!hasData) {
response = Response.temporaryRedirect(
createUploadRedirectionURL(uriInfo,
@@ -478,7 +478,7 @@ public class HttpFSServer {
String doAs = params.get(DoAsParam.NAME, DoAsParam.class);
switch (op.value()) {
case CREATE: {
- boolean hasData = params.get(DataParam.NAME, DataParam.class);
+ Boolean hasData = params.get(DataParam.NAME, DataParam.class);
if (!hasData) {
response = Response.temporaryRedirect(
createUploadRedirectionURL(uriInfo,
@@ -486,11 +486,11 @@ public class HttpFSServer {
} else {
Short permission = params.get(PermissionParam.NAME,
PermissionParam.class);
- boolean override = params.get(OverwriteParam.NAME,
+ Boolean override = params.get(OverwriteParam.NAME,
OverwriteParam.class);
- short replication = params.get(ReplicationParam.NAME,
+ Short replication = params.get(ReplicationParam.NAME,
ReplicationParam.class);
- long blockSize = params.get(BlockSizeParam.NAME,
+ Long blockSize = params.get(BlockSizeParam.NAME,
BlockSizeParam.class);
FSOperations.FSCreate command =
new FSOperations.FSCreate(is, path, permission, override,
@@ -543,7 +543,7 @@ public class HttpFSServer {
break;
}
case SETREPLICATION: {
- short replication = params.get(ReplicationParam.NAME,
+ Short replication = params.get(ReplicationParam.NAME,
ReplicationParam.class);
FSOperations.FSSetReplication command =
new FSOperations.FSSetReplication(path, replication);
@@ -553,9 +553,9 @@ public class HttpFSServer {
break;
}
case SETTIMES: {
- long modifiedTime = params.get(ModifiedTimeParam.NAME,
+ Long modifiedTime = params.get(ModifiedTimeParam.NAME,
ModifiedTimeParam.class);
- long accessTime = params.get(AccessTimeParam.NAME,
+ Long accessTime = params.get(AccessTimeParam.NAME,
AccessTimeParam.class);
FSOperations.FSSetTimes command =
new FSOperations.FSSetTimes(path, modifiedTime, accessTime);
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1355595&r1=1355594&r2=1355595&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Jun 29 22:59:09 2012
@@ -261,6 +261,10 @@ Release 2.0.1-alpha - UNRELEASED
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
INCOMPATIBLE CHANGES