You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2015/05/09 23:09:02 UTC

cassandra git commit: simplify: switch contains & get -> get

Repository: cassandra
Updated Branches:
  refs/heads/trunk 6cb19216f -> 16bf51211


simplify: switch contains & get -> get


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

Branch: refs/heads/trunk
Commit: 16bf51211594fada8115ca70e3731aa3d4440191
Parents: 6cb1921
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 9 17:08:27 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 9 17:08:27 2015 -0400

----------------------------------------------------------------------
 .../cassandra/io/sstable/metadata/MetadataSerializer.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/16bf5121/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
index 46fbbe2..8a65d8d 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
@@ -116,9 +116,10 @@ public class MetadataSerializer implements IMetadataSerializer
         for (MetadataType type : types)
         {
             MetadataComponent component = null;
-            if (toc.containsKey(type))
+            Integer offset = toc.get(type);
+            if (offset != null)
             {
-                in.seek(toc.get(type));
+                in.seek(offset);
                 component = type.serializer.deserialize(descriptor.version, in);
             }
             components.put(type, component);