Author: gdusbabek
Date: Fri Apr 8 14:40:30 2011
New Revision: 1090277
URL: http://svn.apache.org/viewvc?rev=1090277&view=rev
Log:
handle Compression.NONE in CassandraServer
Modified:
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=1090277&r1=1090276&r2=1090277&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Fri Apr 8 14:40:30 2011
@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
+import java.nio.charset.CharacterCodingException;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.Callable;
@@ -1140,6 +1141,17 @@ public class CassandraServer implements
decompressor.end();
queryString = new String(byteArray.toByteArray(), 0,
byteArray.size(), "UTF-8");
+ break;
+ case NONE:
+ try
+ {
+ queryString = ByteBufferUtil.string(query);
+ }
+ catch (CharacterCodingException ex)
+ {
+ throw new InvalidRequestException(ex.getMessage());
+ }
+ break;
}
}
catch (DataFormatException e)
