accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/6] git commit: ACCUMULO-3221 Ensure arithmetic happens as longs and not integers.
Date Fri, 10 Oct 2014 18:20:40 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.5 854dce9ff -> e18aacda3
  refs/heads/1.6 e7dc5364d -> 5029a4422
  refs/heads/master 300f7941c -> 52a1f1124


ACCUMULO-3221 Ensure arithmetic happens as longs and not integers.


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

Branch: refs/heads/1.5
Commit: e18aacda38d36871aa9d8c39594174af3006f216
Parents: 854dce9
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 10 14:10:41 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 10 14:10:41 2014 -0400

----------------------------------------------------------------------
 core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e18aacda/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index 6943b37..a2834ff 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -229,7 +229,7 @@ public class Shell extends ShellOptions {
       }
       
       setDebugging(cl.hasOption(debugOption.getLongOpt()));
-      authTimeout = Integer.parseInt(cl.getOptionValue(authTimeoutOpt.getLongOpt(), DEFAULT_AUTH_TIMEOUT))
* 60 * 1000;
+      authTimeout = Integer.parseInt(cl.getOptionValue(authTimeoutOpt.getLongOpt(), DEFAULT_AUTH_TIMEOUT))
* 60 * 1000l;
       disableAuthTimeout = cl.hasOption(disableAuthTimeoutOpt.getLongOpt());
       
       if (cl.hasOption(zooKeeperInstance.getOpt()) && cl.getOptionValues(zooKeeperInstance.getOpt()).length
!= 2)


Mime
View raw message