accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/6] accumulo git commit: ACCUMULO-3509 Fix a compiler warning.
Date Wed, 13 Jan 2016 20:11:21 GMT
ACCUMULO-3509 Fix a compiler warning.


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

Branch: refs/heads/1.7
Commit: 8c6866efbb40aa1732b79f99c92458f3e672d14a
Parents: 29c6052
Author: Josh Elser <elserj@apache.org>
Authored: Wed Jan 13 14:08:50 2016 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Jan 13 14:08:50 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c6866ef/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 b7aaf06..4e3e00b 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
@@ -923,15 +923,17 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
 
     @Override
     public boolean cleanup() {
+      final boolean ret;
       try {
         if (nextBatchTask != null)
           nextBatchTask.cancel(true);
       } finally {
         if (scanner != null)
-          return scanner.close();
+          ret = scanner.close();
         else
-          return true;
+          ret = true;
       }
+      return ret;
     }
 
   }


Mime
View raw message