Author: brandonli
Date: Sun Feb 9 23:32:14 2014
New Revision: 1566471
URL: http://svn.apache.org/r1566471
Log:
HDFS-5886. Merging change r1566468 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java?rev=1566471&r1=1566470&r2=1566471&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
Sun Feb 9 23:32:14 2014
@@ -545,7 +545,8 @@ public class RpcProgramNfs3 extends RpcP
return new READLINK3Response(Nfs3Status.NFS3ERR_SERVERFAULT);
}
if (MAX_READ_TRANSFER_SIZE < target.getBytes().length) {
- return new READLINK3Response(Nfs3Status.NFS3ERR_IO, postOpAttr, null);
+ return new READLINK3Response(Nfs3Status.NFS3ERR_IO, postOpAttr,
+ new byte[0]);
}
return new READLINK3Response(Nfs3Status.NFS3_OK, postOpAttr,
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=1566471&r1=1566470&r2=1566471&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
Sun Feb 9 23:32:14 2014
@@ -69,6 +69,9 @@ Release 2.4.0 - UNRELEASED
HDFS-5900. Cannot set cache pool limit of "unlimited" via CacheAdmin.
(wang)
+ HDFS-5886. Potential null pointer deference in RpcProgramNfs3#readlink()
+ (brandonli)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
