Merge remote-tracking branch 'origin/master'

rantav · Mar 17, 2012 · bb4ab08 · bb4ab08
2 parents 7055e9f + 75fa955
commit bb4ab08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/core/src/main/java/me/prettyprint/cassandra/service/ExceptionsTranslatorImpl.java b/core/src/main/java/me/prettyprint/cassandra/service/ExceptionsTranslatorImpl.java
@@ -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) {

diff --git a/object-mapper/CHANGELOG b/object-mapper/CHANGELOG
@@ -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