You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/12/17 15:42:54 UTC
svn commit: r1050404 -
/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnSerializer.java
Author: jbellis
Date: Fri Dec 17 14:42:53 2010
New Revision: 1050404
URL: http://svn.apache.org/viewvc?rev=1050404&view=rev
Log:
r/m unused code
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnSerializer.java
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnSerializer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnSerializer.java?rev=1050404&r1=1050403&r2=1050404&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnSerializer.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnSerializer.java Fri Dec 17 14:42:53 2010
@@ -90,14 +90,11 @@ public class ColumnSerializer implements
}
else
{
- boolean delete = (b & DELETION_MASK) != 0;
long ts = dis.readLong();
ByteBuffer value = FBUtilities.readByteArray(dis);
- if ((b & DELETION_MASK) != 0) {
- return new DeletedColumn(name, value, ts);
- } else {
- return new Column(name, value, ts);
- }
+ return (b & DELETION_MASK) == 0
+ ? new Column(name, value, ts)
+ : new DeletedColumn(name, value, ts);
}
}