Return-Path: 
 <commits-return-6287-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0DB2710197
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Sat, 23 Nov 2013 01:41:57 +0000 (UTC)
Received: (qmail 18872 invoked by uid 500); 23 Nov 2013 01:41:55 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 18542 invoked by uid 500); 23 Nov 2013 01:41:55 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 18409 invoked by uid 99); 23 Nov 2013 01:41:54 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Nov 2013 01:41:54 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 86FC9902A8E; Sat, 23 Nov 2013 01:41:54 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: elserj@apache.org
To: commits@accumulo.apache.org
Date: Sat, 23 Nov 2013 01:42:04 -0000
Message-Id: <e87c6d8e790145e29841667aaa80890b@git.apache.org>
In-Reply-To: <05f71fc0259046c792a7f8a2460da513@git.apache.org>
References: <05f71fc0259046c792a7f8a2460da513@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [11/19] git commit: ACCUMULO-1854 Account for 1.4 to 1.5 changes in
 how Authorizations.serialize works.

ACCUMULO-1854 Account for 1.4 to 1.5 changes in how Authorizations.serialize works.


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: ef64992c6ef35ee4aba1ea0970981761e589e8c4
Parents: e08736d
Author: Josh Elser <elserj@apache.org>
Authored: Thu Nov 21 21:39:51 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Nov 21 21:39:51 2013 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/mapreduce/RangeInputSplit.java  | 5 +++--
 .../accumulo/core/client/mapreduce/RangeInputSplitTest.java     | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ef64992c/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 6decdc6..9855c31 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -166,14 +166,15 @@ public class RangeInputSplit extends InputSplit implements Writable {
       int numColumns = in.readInt();
       List<String> columns = new ArrayList<String>(numColumns);
       for (int i = 0; i < numColumns; i++) {
-        columns.set(i, in.readUTF());
+        columns.add(in.readUTF());
       }
       
       fetchedColumns = InputConfigurator.deserializeFetchedColumns(columns);
     }
     
     if (in.readBoolean()) {
-      auths = new Authorizations(StringUtils.split(in.readUTF()));
+      String strAuths = in.readUTF();
+      auths = new Authorizations(strAuths.getBytes(Charset.forName("UTF-8")));
     }
     
     if (in.readBoolean()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ef64992c/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
index f6c604f..6da07a5 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
@@ -39,8 +39,6 @@ public class RangeInputSplitTest {
     Assert.assertTrue(Arrays.equals(split.getLocations(), newSplit.getLocations()));
   }
 
-
-
   @Test
   public void testAllFieldsWritable() throws IOException {
     RangeInputSplit split = new RangeInputSplit(new Range(new Key("a"), new Key("b")), new String[]{"localhost"});