accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/3] git commit: ACCUMULO-2160 back-port real bugs found by findbugs
Date Fri, 10 Jan 2014 15:15:05 GMT
Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 96bfa8cad -> c0db9ca37


ACCUMULO-2160 back-port real bugs found by findbugs


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 5dd6f84bc1858d894cfbaedbdecfb9acae15f877
Parents: 9abb725
Author: Eric Newton <eric.newton@gmail.com>
Authored: Thu Jan 9 15:41:37 2014 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Thu Jan 9 15:41:37 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/mapreduce/RangeInputSplit.java    | 3 ++-
 src/server/src/main/java/org/apache/accumulo/server/Accumulo.java | 2 +-
 .../org/apache/accumulo/server/tabletserver/TabletServer.java     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5dd6f84b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
----------------------------------------------------------------------
diff --git a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 69f2b38..01921c4 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -20,6 +20,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
@@ -309,7 +310,7 @@ public class RangeInputSplit extends InputSplit implements Writable {
   public String toString() {
     StringBuilder sb = new StringBuilder(128);
     sb.append("Range: ").append(range);
-    sb.append(" Locations: ").append(locations);
+    sb.append(" Locations: ").append(Arrays.asList(locations));
     sb.append(" Table: ").append(table);
     sb.append(" InstanceName: ").append(instanceName);
     sb.append(" zooKeepers: ").append(zooKeepers);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5dd6f84b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index 253962b..4e909a7 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -117,7 +117,7 @@ public class Accumulo {
       System.setProperty("org.apache.accumulo.core.host.log", localhost);
     
     // Use a specific log config, if it exists
-    String logConfig = String.format("%s/%s_logger.xml", System.getenv("ACCUMULO_CONF_DIR"),
application);
+    String logConfig = String.format("%s/%s_logger.xml", System.getenv("ACCUMULO_CONF_DIR"));
     if (!new File(logConfig).exists()) {
       // otherwise, use the generic config
       logConfig = String.format("%s/generic_logger.xml", System.getenv("ACCUMULO_CONF_DIR"));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5dd6f84b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 33082ea..ff4f1bc 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2464,7 +2464,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
               openingTablets.remove(extentToOpen);
               onlineTablets.put(extentToOpen, tablet);
               openingTablets.notifyAll();
-              recentlyUnloadedCache.remove(tablet);
+              recentlyUnloadedCache.remove(tablet.getExtent());
             }
           }
           tablet = null; // release this reference


Mime
View raw message