Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 7055e9f + 75fa955 commit bb4ab08c8c38f0bc29bf457f62f2b1c6e1024abb @patricioe patricioe committed Mar 17, 2012
@@ -30,14 +30,7 @@ public HectorException translate(Throwable original) {
} else if (original instanceof TApplicationException) {
return new HCassandraInternalException(((TApplicationException)original).getType(), original.getMessage());
} else if (original instanceof TTransportException) {
- // if the underlying cause is a scoket timeout, reflect that directly
- // TODO this may be an issue on the Cassandra side which warrants ivestigation.
- // I seem to remember these coming back as TimedOutException previously
- if ( ((TTransportException)original).getCause() instanceof SocketTimeoutException ) {
- return new HTimedOutException(original);
- } else {
- return new HectorTransportException(original);
- }
+ return new HectorTransportException(original);
} else if (original instanceof org.apache.cassandra.thrift.TimedOutException) {
return new HTimedOutException(original);
} else if (original instanceof org.apache.cassandra.thrift.InvalidRequestException) {
@@ -1,6 +1,9 @@
Changes by version:
===================
+3.0-03
+- Fixed issues with generics and JDK's prior to 1.6.0_25
+
3.0-02
- issue-402 : fix single collection instantiation
- issue-207 : added VariableIntegerConverter

0 comments on commit bb4ab08

Please sign in to comment.