[15/50] [abbrv] hadoop git commit: HDFS-7502. Fix findbugs warning in hdfs-nfs project. Contributed by Brandon Li.

2014-12-15 Thread kasha 
HDFS-7502. Fix findbugs warning in hdfs-nfs project. Contributed by Brandon Li.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/195f31a8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/195f31a8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/195f31a8

Branch: refs/heads/YARN-2139
Commit: 195f31a8ef6b15e1962ab945b2f83af98e0058c6
Parents: d93f3b9
Author: Haohui Mai whe...@apache.org
Authored: Tue Dec 9 20:42:42 2014 -0800
Committer: Haohui Mai whe...@apache.org
Committed: Tue Dec 9 20:42:42 2014 -0800

--
 .../apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java  | 15 +--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/195f31a8/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
index c860dd5..aaac797 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
@@ -25,6 +25,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.EnumSet;
 
 import org.apache.commons.logging.Log;
@@ -651,15 +652,16 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
   }
   int rtmax = 
config.getInt(NfsConfigKeys.DFS_NFS_MAX_READ_TRANSFER_SIZE_KEY,
   NfsConfigKeys.DFS_NFS_MAX_READ_TRANSFER_SIZE_DEFAULT);
-  if (rtmax  target.getBytes().length) {
-LOG.error(Link size:  + target.getBytes().length
+  if (rtmax  target.getBytes(Charset.forName(UTF-8)).length) {
+LOG.error(Link size: 
++ target.getBytes(Charset.forName(UTF-8)).length
 +  is larger than max transfer size:  + rtmax);
 return new READLINK3Response(Nfs3Status.NFS3ERR_IO, postOpAttr,
 new byte[0]);
   }
 
   return new READLINK3Response(Nfs3Status.NFS3_OK, postOpAttr,
-  target.getBytes());
+  target.getBytes(Charset.forName(UTF-8)));
 
 } catch (IOException e) {
   LOG.warn(Readlink error:  + e.getClass(), e);
@@ -1462,7 +1464,8 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 throw io;
   }
   // This happens when startAfter was just deleted
-  LOG.info(Cookie couldn't be found:  + new String(startAfter)
+  LOG.info(Cookie couldn't be found: 
+  + new String(startAfter, Charset.forName(UTF-8))
   + , do listing from beginning);
   dlisting = dfsClient
   .listPaths(dirFileIdPath, HdfsFileStatus.EMPTY_NAME);
@@ -1571,7 +1574,7 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 startAfter = HdfsFileStatus.EMPTY_NAME;
   } else {
 String inodeIdPath = Nfs3Utils.getFileIdPath(cookie);
-startAfter = inodeIdPath.getBytes();
+startAfter = inodeIdPath.getBytes(Charset.forName(UTF-8));
   }
 
   dlisting = listPaths(dfsClient, dirFileIdPath, startAfter);
@@ -1733,7 +1736,7 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 startAfter = HdfsFileStatus.EMPTY_NAME;
   } else {
 String inodeIdPath = Nfs3Utils.getFileIdPath(cookie);
-startAfter = inodeIdPath.getBytes();
+startAfter = inodeIdPath.getBytes(Charset.forName(UTF-8));
   }
 
   dlisting = listPaths(dfsClient, dirFileIdPath, startAfter);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/195f31a8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d141439..9f3f9ee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -561,6 +561,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7481. Add ACL indicator to the Permission Denied exception.
 (vinayakumarb)
 
+HDFS-7502. Fix findbugs warning in hdfs-nfs project.
+(Brandon Li via wheat9)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop git commit: HDFS-7502. Fix findbugs warning in hdfs-nfs project. Contributed by Brandon Li.

2014-12-09 Thread wheat9 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 19627e589 - c2514aaa8


HDFS-7502. Fix findbugs warning in hdfs-nfs project. Contributed by Brandon Li.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c2514aaa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c2514aaa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c2514aaa

Branch: refs/heads/branch-2
Commit: c2514aaa8352dc0f33c8962fae51f97f01201475
Parents: 19627e5
Author: Haohui Mai whe...@apache.org
Authored: Tue Dec 9 20:42:42 2014 -0800
Committer: Haohui Mai whe...@apache.org
Committed: Tue Dec 9 20:43:20 2014 -0800

--
 .../apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java  | 15 +--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c2514aaa/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
index c860dd5..aaac797 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
@@ -25,6 +25,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.EnumSet;
 
 import org.apache.commons.logging.Log;
@@ -651,15 +652,16 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
   }
   int rtmax = 
config.getInt(NfsConfigKeys.DFS_NFS_MAX_READ_TRANSFER_SIZE_KEY,
   NfsConfigKeys.DFS_NFS_MAX_READ_TRANSFER_SIZE_DEFAULT);
-  if (rtmax  target.getBytes().length) {
-LOG.error(Link size:  + target.getBytes().length
+  if (rtmax  target.getBytes(Charset.forName(UTF-8)).length) {
+LOG.error(Link size: 
++ target.getBytes(Charset.forName(UTF-8)).length
 +  is larger than max transfer size:  + rtmax);
 return new READLINK3Response(Nfs3Status.NFS3ERR_IO, postOpAttr,
 new byte[0]);
   }
 
   return new READLINK3Response(Nfs3Status.NFS3_OK, postOpAttr,
-  target.getBytes());
+  target.getBytes(Charset.forName(UTF-8)));
 
 } catch (IOException e) {
   LOG.warn(Readlink error:  + e.getClass(), e);
@@ -1462,7 +1464,8 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 throw io;
   }
   // This happens when startAfter was just deleted
-  LOG.info(Cookie couldn't be found:  + new String(startAfter)
+  LOG.info(Cookie couldn't be found: 
+  + new String(startAfter, Charset.forName(UTF-8))
   + , do listing from beginning);
   dlisting = dfsClient
   .listPaths(dirFileIdPath, HdfsFileStatus.EMPTY_NAME);
@@ -1571,7 +1574,7 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 startAfter = HdfsFileStatus.EMPTY_NAME;
   } else {
 String inodeIdPath = Nfs3Utils.getFileIdPath(cookie);
-startAfter = inodeIdPath.getBytes();
+startAfter = inodeIdPath.getBytes(Charset.forName(UTF-8));
   }
 
   dlisting = listPaths(dfsClient, dirFileIdPath, startAfter);
@@ -1733,7 +1736,7 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 startAfter = HdfsFileStatus.EMPTY_NAME;
   } else {
 String inodeIdPath = Nfs3Utils.getFileIdPath(cookie);
-startAfter = inodeIdPath.getBytes();
+startAfter = inodeIdPath.getBytes(Charset.forName(UTF-8));
   }
 
   dlisting = listPaths(dfsClient, dirFileIdPath, startAfter);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c2514aaa/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 2496083..8d1facd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -304,6 +304,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7481. Add ACL indicator to the Permission Denied exception.
 (vinayakumarb)
 
+HDFS-7502. Fix findbugs warning in hdfs-nfs project.
+(Brandon Li via wheat9)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop git commit: HDFS-7502. Fix findbugs warning in hdfs-nfs project. Contributed by Brandon Li.

2014-12-09 Thread wheat9 
Repository: hadoop
Updated Branches:
  refs/heads/trunk d93f3b981 - 195f31a8e


HDFS-7502. Fix findbugs warning in hdfs-nfs project. Contributed by Brandon Li.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/195f31a8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/195f31a8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/195f31a8

Branch: refs/heads/trunk
Commit: 195f31a8ef6b15e1962ab945b2f83af98e0058c6
Parents: d93f3b9
Author: Haohui Mai whe...@apache.org
Authored: Tue Dec 9 20:42:42 2014 -0800
Committer: Haohui Mai whe...@apache.org
Committed: Tue Dec 9 20:42:42 2014 -0800

--
 .../apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java  | 15 +--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/195f31a8/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
index c860dd5..aaac797 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
@@ -25,6 +25,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.EnumSet;
 
 import org.apache.commons.logging.Log;
@@ -651,15 +652,16 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
   }
   int rtmax = 
config.getInt(NfsConfigKeys.DFS_NFS_MAX_READ_TRANSFER_SIZE_KEY,
   NfsConfigKeys.DFS_NFS_MAX_READ_TRANSFER_SIZE_DEFAULT);
-  if (rtmax  target.getBytes().length) {
-LOG.error(Link size:  + target.getBytes().length
+  if (rtmax  target.getBytes(Charset.forName(UTF-8)).length) {
+LOG.error(Link size: 
++ target.getBytes(Charset.forName(UTF-8)).length
 +  is larger than max transfer size:  + rtmax);
 return new READLINK3Response(Nfs3Status.NFS3ERR_IO, postOpAttr,
 new byte[0]);
   }
 
   return new READLINK3Response(Nfs3Status.NFS3_OK, postOpAttr,
-  target.getBytes());
+  target.getBytes(Charset.forName(UTF-8)));
 
 } catch (IOException e) {
   LOG.warn(Readlink error:  + e.getClass(), e);
@@ -1462,7 +1464,8 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 throw io;
   }
   // This happens when startAfter was just deleted
-  LOG.info(Cookie couldn't be found:  + new String(startAfter)
+  LOG.info(Cookie couldn't be found: 
+  + new String(startAfter, Charset.forName(UTF-8))
   + , do listing from beginning);
   dlisting = dfsClient
   .listPaths(dirFileIdPath, HdfsFileStatus.EMPTY_NAME);
@@ -1571,7 +1574,7 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 startAfter = HdfsFileStatus.EMPTY_NAME;
   } else {
 String inodeIdPath = Nfs3Utils.getFileIdPath(cookie);
-startAfter = inodeIdPath.getBytes();
+startAfter = inodeIdPath.getBytes(Charset.forName(UTF-8));
   }
 
   dlisting = listPaths(dfsClient, dirFileIdPath, startAfter);
@@ -1733,7 +1736,7 @@ public class RpcProgramNfs3 extends RpcProgram implements 
Nfs3Interface {
 startAfter = HdfsFileStatus.EMPTY_NAME;
   } else {
 String inodeIdPath = Nfs3Utils.getFileIdPath(cookie);
-startAfter = inodeIdPath.getBytes();
+startAfter = inodeIdPath.getBytes(Charset.forName(UTF-8));
   }
 
   dlisting = listPaths(dfsClient, dirFileIdPath, startAfter);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/195f31a8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d141439..9f3f9ee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -561,6 +561,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7481. Add ACL indicator to the Permission Denied exception.
 (vinayakumarb)
 
+HDFS-7502. Fix findbugs warning in hdfs-nfs project.
+(Brandon Li via wheat9)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES