diff --git a/src/com/meetup/memcached/MemcachedClient.java b/src/com/meetup/memcached/MemcachedClient.java index 96b991b..c17c1fa 100644 --- a/src/com/meetup/memcached/MemcachedClient.java +++ b/src/com/meetup/memcached/MemcachedClient.java @@ -1377,26 +1377,12 @@ public Object get( String key, Integer hashCode, boolean asString ) { if ( log.isInfoEnabled() ) log.info( "++++ deserializing " + o.getClass() ); } - catch ( InvalidClassException e ) { - /* Errors de-serializing are to be expected in the case of a - * long running server that spans client restarts with updated - * classes. - */ - // if we have an errorHandler, use its hook - if ( errorHandler != null ) - errorHandler.handleErrorOnGet( this, e, key ); - - o = null; - log.error( "++++ InvalidClassException thrown while trying to deserialize for key: " + key + " -- " + e.getMessage() ); - } - catch ( ClassNotFoundException e ) { - - // if we have an errorHandler, use its hook + catch ( Exception e ) { if ( errorHandler != null ) errorHandler.handleErrorOnGet( this, e, key ); o = null; - log.error( "++++ ClassNotFoundException thrown while trying to deserialize for key: " + key + " -- " + e.getMessage() ); + log.error( "++++ Exception thrown while trying to deserialize for key: " + key + " -- " + e.getMessage() ); } } } diff --git a/src/com/meetup/memcached/SockIOPool.java b/src/com/meetup/memcached/SockIOPool.java index c649b9a..6fe0c92 100644 --- a/src/com/meetup/memcached/SockIOPool.java +++ b/src/com/meetup/memcached/SockIOPool.java @@ -198,7 +198,7 @@ protected MessageDigest initialValue() { // set to hold sockets to close private Map> availPool; private Map> busyPool; - private Map deadPool;; + private Map deadPool; // empty constructor protected SockIOPool() { }