Author: jbellis
Date: Wed Jan 19 16:46:43 2011
New Revision: 1060861
URL: http://svn.apache.org/viewvc?rev=1060861&view=rev
Log:
fix build
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=1060861&r1=1060860&r2=1060861&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
Wed Jan 19 16:46:43 2011
@@ -295,9 +295,9 @@ public class SSTableReader extends SSTab
break;
boolean shouldAddEntry = indexSummary.shouldAddEntry();
- ByteBuffer key = (ByteBuffer) ((shouldAddEntry || cacheLoading
|| recreatebloom)
+ ByteBuffer key = (shouldAddEntry || cacheLoading ||
recreatebloom)
? ByteBufferUtil.readWithShortLength(input)
- : ByteBufferUtil.skipShortLength(input));
+ : ByteBufferUtil.skipShortLength(input);
long dataPosition = input.readLong();
if (key != null)
{
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java?rev=1060861&r1=1060860&r2=1060861&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
Wed Jan 19 16:46:43 2011
@@ -305,7 +305,7 @@ public class ByteBufferUtil
* @return null
* @throws IOException if an I/O error occurs.
*/
- public static void skipShortLength(DataInput in) throws IOException
+ public static ByteBuffer skipShortLength(DataInput in) throws IOException
{
int skip = readShortLength(in);
while (skip > 0)
@@ -314,6 +314,7 @@ public class ByteBufferUtil
if (skipped == 0) throw new EOFException();
skip -= skipped;
}
+ return null;
}
private static ByteBuffer read(DataInput in, int length) throws IOException
