accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [11/12] accumulo git commit: Merge branch '1.7'
Date Tue, 29 Sep 2015 23:12:47 GMT
Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 38c559ae8e3d00ec33766dd16a217544466205f5
Parents: 0c94837 22b5258
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Sep 29 18:58:06 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Sep 29 18:58:06 2015 -0400

----------------------------------------------------------------------
 fate/pom.xml                                                | 4 ++++
 .../org/apache/accumulo/server/util/SendLogToChainsaw.java  | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/38c559ae/fate/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/38c559ae/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
index d441a58,d06bc4e..ab11d89
--- a/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
@@@ -128,12 -128,8 +128,12 @@@ public class SendLogToChainsaw extends 
          } catch (FileNotFoundException e) {
            System.out.println("Unable to find file: " + log.getAbsolutePath());
            throw e;
 +        } finally {
 +          if (isReader != null) {
 +            isReader.close();
 +          }
          }
-         reader = new BufferedReader(isReader);
+         reader = new BufferedReader(new InputStreamReader(fis, UTF_8));
  
          try {
            line = reader.readLine();


Mime
View raw message