accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [2/2] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Tue, 22 Jul 2014 20:06:33 GMT
Merge branch '1.6.1-SNAPSHOT'


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

Branch: refs/heads/master
Commit: ffba5393c230cd132d5efa9a76e764ca60eda091
Parents: 3107627 e8916f1
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Jul 22 16:05:24 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Jul 22 16:05:24 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/master/tableOps/BulkImport.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ffba5393/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 73e0e49,1226806..98f41cd
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@@ -388,11 -388,11 +389,11 @@@ class CopyFailed extends MasterRepo 
      if (!fs.exists(new Path(error, BulkImport.FAILURES_TXT)))
        return new CleanUpBulkImport(tableId, source, bulk, error);
  
-     HashMap<String,String> failures = new HashMap<String,String>();
-     HashMap<String,String> loadedFailures = new HashMap<String,String>();
+     HashMap<FileRef,String> failures = new HashMap<FileRef,String>();
+     HashMap<FileRef,String> loadedFailures = new HashMap<FileRef,String>();
  
      FSDataInputStream failFile = fs.open(new Path(error, BulkImport.FAILURES_TXT));
 -    BufferedReader in = new BufferedReader(new InputStreamReader(failFile, Constants.UTF8));
 +    BufferedReader in = new BufferedReader(new InputStreamReader(failFile, StandardCharsets.UTF_8));
      try {
        String line = null;
        while ((line = in.readLine()) != null) {


Mime
View raw message