[3/3] git commit: Revert "cqlsh: check for non-empty history file before loading"

[br...@apache.org]

Revert "cqlsh: check for non-empty history file before loading"

This reverts commit 6a8ba07313e2fad8c5a6cf7566bbd77321274c60.


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

Branch: refs/heads/cassandra-1.1
Commit: 4d600f338186e2e9c598ccff3e4c6d21327c20c2
Parents: 6ad7d45
Author: Brandon Williams <br...@apache.org>
Authored: Mon Sep 17 20:44:02 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Sep 17 20:44:12 2012 -0500

----------------------------------------------------------------------
 bin/cqlsh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d600f33/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 5f99e45..3bef142 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -2690,7 +2690,7 @@ def setup_cqlruleset(cqlmodule):
 def main(options, hostname, port):
     setup_cqlruleset(options.cqlmodule)
 
-    if os.path.exists(HISTORY) and readline is not None and readline.get_history_length()>0:
+    if os.path.exists(HISTORY) and readline is not None:
         readline.read_history_file(HISTORY)
         delims = readline.get_completer_delims()
         delims.replace("'", "")