svn commit: r1596146 - in /hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common: CHANGES-HDFS-2006.txt src/main/java/org/apache/hadoop/fs/XAttrCodec.java

[umamahesh]

Author: umamahesh
Date: Tue May 20 08:56:31 2014
New Revision: 1596146

URL: http://svn.apache.org/r1596146
Log:
HADOOP-10621. Remove CRLF for xattr value base64 encoding for better display. 
Contributed by Yi Liu.

Modified:
    
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
    
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java

Modified: 
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt?rev=1596146&r1=1596145&r2=1596146&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
 (original)
+++ 
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
 Tue May 20 08:56:31 2014
@@ -20,6 +20,8 @@ HDFS-2006 (Unreleased)
 
     HADOOP-10567. Shift XAttr value encoding code out for reuse. (Yi Liu via 
umamahesh)
 
+    HADOOP-10621. Remove CRLF for xattr value base64 encoding for better 
display.(Yi Liu via umamahesh)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: 
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java?rev=1596146&r1=1596145&r2=1596146&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
 (original)
+++ 
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
 Tue May 20 08:56:31 2014
@@ -57,6 +57,7 @@ public enum XAttrCodec {
   
   private static final String HEX_PREFIX = "0x";
   private static final String BASE64_PREFIX = "0s";
+  private static final Base64 base64 = new Base64(0);
   
   /**
    * Decode string representation of a value and check whether it's 
@@ -86,7 +87,7 @@ public enum XAttrCodec {
           }
         } else if (en.equalsIgnoreCase(BASE64_PREFIX)) {
           value = value.substring(2, value.length());
-          result = Base64.decodeBase64(value);
+          result = base64.decode(value);
         }
       }
       if (result == null) {
@@ -112,7 +113,7 @@ public enum XAttrCodec {
     if (encoding == HEX) {
       return HEX_PREFIX + Hex.encodeHexString(value);
     } else if (encoding == BASE64) {
-      return BASE64_PREFIX + Base64.encodeBase64String(value);
+      return BASE64_PREFIX + base64.encodeToString(value);
     } else {
       return "\"" + new String(value, "utf-8") + "\"";
     }