cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject git commit: Return an empty meta object instead of None. Patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6741
Date Wed, 19 Feb 2014 22:43:42 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ddaddf636 -> ce2bbcbf0


Return an empty meta object instead of None.
Patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6741


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

Branch: refs/heads/cassandra-2.1
Commit: ce2bbcbf02fc19ade198c8444289cd7a805f8dc2
Parents: ddaddf6
Author: Mikhail Stepura <mishail@apache.org>
Authored: Wed Feb 19 14:32:04 2014 -0800
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Wed Feb 19 14:43:14 2014 -0800

----------------------------------------------------------------------
 bin/cqlsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce2bbcbf/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index b0128e7..ef08dab 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -722,7 +722,7 @@ class Shell(cmd.Cmd):
         self.cursor.execute(ut_q, consistency_level='ONE')
         data = self.fetchdict_all()
         if not data:
-            return None
+            return cql3handling.UserTypesMeta({})
 
         return cql3handling.UserTypesMeta.from_layout(data)
 


Mime
View raw message