accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject git commit: ACCUMULO-3222 Get Durability for tablet after null check. Add final modifiers.
Date Fri, 10 Oct 2014 18:45:34 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master b01056616 -> 4bbaddcab


ACCUMULO-3222 Get Durability for tablet after null check. Add final modifiers.


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

Branch: refs/heads/master
Commit: 4bbaddcabebc3570e549212cf330693422560693
Parents: b010566
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 10 14:43:43 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 10 14:44:09 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/tserver/TabletServer.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bbaddca/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 2e1eb2c..51e3d1a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -266,7 +266,7 @@ public class TabletServer implements Runnable {
 
   private final AtomicLong flushCounter = new AtomicLong(0);
   private final AtomicLong syncCounter = new AtomicLong(0);
-  
+
   private final VolumeManager fs;
   public Instance getInstance() {
     return serverConfig.getInstance();
@@ -354,7 +354,7 @@ public class TabletServer implements Runnable {
   private final WriteTracker writeTracker = new WriteTracker();
 
   private final RowLocks rowLocks = new RowLocks();
-  
+
   private final AtomicLong totalQueuedMutationSize = new AtomicLong(0);
 
   private class ThriftClientHandler extends ClientServiceHandler implements TabletClientService.Iface
{
@@ -1098,12 +1098,12 @@ public class TabletServer implements Runnable {
       try {
         long t1 = System.currentTimeMillis();
         for (Entry<KeyExtent,List<ServerConditionalMutation>> entry : es) {
-          Tablet tablet = onlineTablets.get(entry.getKey());
-          Durability tabletDurability = tablet.getDurability();
+          final Tablet tablet = onlineTablets.get(entry.getKey());
           if (tablet == null || tablet.isClosed() || sessionCanceled) {
             for (ServerConditionalMutation scm : entry.getValue())
               results.add(new TCMResult(scm.getID(), TCMStatus.IGNORED));
           } else {
+            final Durability tabletDurability = tablet.getDurability();
             try {
 
               @SuppressWarnings("unchecked")


Mime
View raw message