Hi! I cleaned up your code for you!

CHANGELOG

@@ -7,20 +7,20 @@ Versions above 0.7.0-17 work well with cassandra's 0.7.* (after 0.7.0-beta2)
 
 0.7.0-27
 ========
-Execution time is now actually in micro seconds. Thanks to several folks for pointing this out. 
+Execution time is now actually in micro seconds. Thanks to several folks for pointing this out.
 Added IO stream mutators. Thanks to Norman Maurer for the pull request.
 Added method to HFactory for safe shutdown of cluster
 Added suspend/unsuspend operations to HConnectionManager, operations for suh in JMX
 Cleanup of numActive counter on ConcurrentHClientPool. Could cause negative results under some high-load situations. Thanks to Yang Yang for the tip.
 fix NPE with poolExhaustedException. Thanks to Yang Yang for the tip
-Fixed issue with ttl not being set on result columns. Thanks to ML user Kallin for the heads up. 
+Fixed issue with ttl not being set on result columns. Thanks to ML user Kallin for the heads up.
 
 0.7.0-26
 ========
 Fix issue with NPE in ThriftColumnDef when a column name was declared with no index type (thanks to Steve Willcox for the heads up)
 Mutator has easier row level deletion methods
 Fix potential race condition in ConcurrentHClientPool with large number of threads. https://github.com/rantav/hector/issues#issue/136 (Thanks to @masseyke for the test case)
-LeastActive policy updated to shuffle before selection. This spreads load out better among pools in low to moderate traffic environments (ie. when ConcurrentHClientPool#getNumActive are all equal). 
+LeastActive policy updated to shuffle before selection. This spreads load out better among pools in low to moderate traffic environments (ie. when ConcurrentHClientPool#getNumActive are all equal).
 Fix NPE in checking that cassandraHostRetryService is turned when host is being marked down (thanks to ML poster Shimi for bug report)
 A CassandraClientMonitor instance is now created per cluster to make JMX integration with multi-cluster setups much easier. (https://github.com/rantav/hector/issues/issue/137)
 
@@ -33,7 +33,7 @@ Fix issue with RR Load balancing policy that cause ArrayOutOfBounds.. in some si
 0.7.0-24
 ========
 Fixed issue with null keyspaces and credentials in HConnectionManager (via Michael Moores)
-Added class-level default for failoverPolicy 
+Added class-level default for failoverPolicy
 Rudimentary (very much so) JPA 2.0 support for save and load via openjpa
 Ligthweight ORM for JPA 1.0 annotations (additional improvements to BTodd's hector-object-mapper merged in)
 Some cleanup of bytebuffer handling in serializers
@@ -47,17 +47,17 @@ CassandraHostRetryService default queue size now defaults unbounded
 Initial import of BToddB's hector-object-mapper as object-mapper module
 Object mapper ported over to JPA annotations and EntityManager (very redimentary support)
 Fix issue with createKeyspace requiring additional column info
-Massive changes to pom structure courtesy of Stephen Connolly to facilitate inclusion into maven central repository. 
+Massive changes to pom structure courtesy of Stephen Connolly to facilitate inclusion into maven central repository.
 Small tweaks to HConnectionManager courtesy of Benoit Perroud
-Collection conversions in AbstractSerializer use the size of the provided collection for initialization. Patch courtesy of Benoit Perroud. 
+Collection conversions in AbstractSerializer use the size of the provided collection for initialization. Patch courtesy of Benoit Perroud.
 Treat HUnavailableException the same as HTimeoutException
 
 0.7.0-22
 ========
 Fix issue with LeastActiveBalancingPolicy that favoured same host repeatedly
 Define ClockResolution as an Interface to allow client to define their own implementations
 Added TimeUUID support (me.prettyprint.cassandra.utils.TimeUUIDUtils)
-Added updateColumnFamily to Cluster 
+Added updateColumnFamily to Cluster
 Shorterm fix for catching InvalidRequestException and handling it correctly for a bootstraping node
 
 
@@ -89,7 +89,7 @@ Refactoring of the connection pooling innards to fix epic race condition on fail
 - Removal of classes effectively matching the pattern CassandraClient* from the service package
 - Command is gone. It was no longer needed and was more confusing than anything else
 - Pooling logic has been stress tested by a neutral third party (no, really!)
-Upgrade to thrift 0.5 to match Cassandra (it caught us by surprise as well). 
+Upgrade to thrift 0.5 to match Cassandra (it caught us by surprise as well).
 The system_rename_* methods were removed matching removal of such in Thrift API
 Microsecond level granularity is now the default
 NodeAutoDiscoverService will periodically look for new hosts on the ring and add them (off by default)
@@ -103,13 +103,13 @@ Move all the API stuff to me.prettyprint.hector.api.*. Extract interfaces and pr
  - Rename KeyspaceOperator and extract a Keyspace interface from it
 Rename a few exceptions to begin with HSomething so they are hard to unintentionally mix with their thrift doubles.
 Bug fixes:
- CassandraClientPoolByHostImpl can throw NoSuchElementException 
+ CassandraClientPoolByHostImpl can throw NoSuchElementException
  KeyspaceImpl.toString returns super.toString()
  API V2 has no means of getting all columns from a row.
  KeyspaceOperator throws NPE that masks real exceptions
  Timestamp (and Clock in 0.7.0) are not set on HColumn in the constructor
  Friendlier API and spring integration
- Error in failover - incorrect operation when borrowClient throws an 
+ Error in failover - incorrect operation when borrowClient throws an
  batchMutate doesn't work with null predicate in deletion. Cannot batch-delete rows.
  getSuperColumn() does not return null
  KeyspaceImpl.getSuperColumn() should use cassandra.get() and not cassandra.get_slice()

README

@@ -1,6 +1,6 @@
 The current 0.7.0 branch will work with Apache Cassandra 0.7.x. The master has been switched to tracking Apache Cassandra 0.8.0. Current releases on the downloads section should be cosidered production ready. You should always choose the most recent release for your version of Apache Cassandra.
 
-As of version 0.7.0-23, Hector artificats are deployed to Maven Central. If you use maven for your build system, you need only include the hector-core dependency and all related dependencies will be managed automatically. 
+As of version 0.7.0-23, Hector artificats are deployed to Maven Central. If you use maven for your build system, you need only include the hector-core dependency and all related dependencies will be managed automatically.
 ----------------------------------------------------------------------------------------------------
 
 Hector is a high level Java client for Apache Cassandra.
@@ -25,9 +25,10 @@ Some features provided by this client:
  o simple ORM layer that works
  o a type-safe approach to dealing with Apache Cassandra's data model
 
-Detailed documentation of Hector features and usage can be found in PDF form hosted by Riptano: http://www.riptano.com/sites/default/files/hector-v2-client-doc.pdf
+Detailed documentation of Hector features and usage can be found on the wiki:
+https://github.com/rantav/hector/wiki/User-Guide
 
-Some interesting pages from the wiki:
+Some additional pages from the wiki that may be of interest:
 
  o SLF4J fun and hijinks: https://github.com/rantav/hector/wiki/SLF4J-in-Hector-
  o Mailing Lists: https://github.com/rantav/hector/wiki/Mailing-Lists

core/pom.xml

@@ -86,7 +86,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkMode>always</forkMode>
-          <argLine>-Xmx512M -Xms512M</argLine>
+          <argLine>-Xmx512M -Xms512M -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
         </configuration>
       </plugin>
     </plugins>
@@ -105,63 +105,66 @@
     <dependency>
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-all</artifactId>
-      <version>0.8.0-20110216</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cassandra.deps</groupId>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>cassandra-thrift</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
     </dependency>
-    <dependency> 
-      <groupId>org.yaml</groupId> 
-      <artifactId>snakeyaml</artifactId> 
-      <version>1.6</version> 
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.6</version>
       <scope>test</scope>
-    </dependency> 
-    <dependency> 
-      <groupId>com.google.guava</groupId> 
-      <artifactId>guava</artifactId> 
-      <version>r08</version> 
-    </dependency> 
-    <dependency> 
-      <groupId>commons-collections</groupId> 
-      <artifactId>commons-collections</artifactId> 
-      <version>3.2.1</version> 
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>r08</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
       <scope>test</scope>
-    </dependency> 
-    <dependency> 
-      <groupId>org.apache.cassandra.deps</groupId> 
-      <artifactId>avro</artifactId> 
-      <version>1.4.0-cassandra-1</version> 
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cassandra.deps</groupId>
+      <artifactId>avro</artifactId>
+      <version>1.4.0-cassandra-1</version>
       <scope>test</scope>
-      <exclusions> 
-        <exclusion> 
-          <artifactId>netty</artifactId> 
-          <groupId>org.jboss.netty</groupId> 
-        </exclusion> 
-        <exclusion> 
-          <artifactId>paranamer</artifactId> 
-          <groupId>com.thoughtworks.paranamer</groupId> 
-        </exclusion> 
-        <exclusion> 
-          <artifactId>paranamer-ant</artifactId> 
-          <groupId>com.thoughtworks.paranamer</groupId> 
-        </exclusion> 
-        <exclusion> 
-          <artifactId>velocity</artifactId> 
-          <groupId>org.apache.velocity</groupId> 
-        </exclusion> 
-      </exclusions> 
-    </dependency> 
-    <dependency> 
-      <groupId>org.antlr</groupId> 
-      <artifactId>antlr</artifactId> 
+      <exclusions>
+        <exclusion>
+          <artifactId>netty</artifactId>
+          <groupId>org.jboss.netty</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>paranamer</artifactId>
+          <groupId>com.thoughtworks.paranamer</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>paranamer-ant</artifactId>
+          <groupId>com.thoughtworks.paranamer</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>velocity</artifactId>
+          <groupId>org.apache.velocity</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr</artifactId>
       <version>3.1.3</version>
-      <scope>test</scope> 
-    </dependency>     
-    <dependency> 
-      <groupId>com.googlecode.concurrentlinkedhashmap</groupId> 
-      <artifactId>concurrentlinkedhashmap-lru</artifactId> 
-      <version>1.1</version> 
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+      <artifactId>concurrentlinkedhashmap-lru</artifactId>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -187,9 +190,9 @@
       <version>3.2.0</version>
     </dependency>
     <dependency>
-      <groupId>org.perf4j</groupId>
-      <artifactId>perf4j</artifactId>
-      <version>0.9.12</version>
+      <groupId>com.ecyrd.speed4j</groupId>
+      <artifactId>speed4j</artifactId>
+      <version>0.5</version>
     </dependency>
 
 	<!-- Note the optional tag. If you need to use fastinfoset serialization, you must include this dependency in your project! -->
@@ -226,7 +229,7 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
-    </dependency>     
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -280,5 +283,10 @@
       <name>riptano</name>
       <url>http://mvn.riptano.com/content/repositories/public/</url>
     </repository>
+    <repository>
+      <id>apache-staging</id>
+      <name>apache-staging</name>
+      <url>https://repository.apache.org/content/repositories/orgapachecassandra-114</url>
+    </repository>
   </repositories>
 </project>

core/src/main/java/me/prettyprint/cassandra/connection/BackgroundCassandraHostService.java

@@ -20,12 +20,7 @@ public BackgroundCassandraHostService(HConnectionManager connectionManager,
       CassandraHostConfigurator cassandraHostConfigurator) {
     this.connectionManager = connectionManager;
     this.cassandraHostConfigurator = cassandraHostConfigurator;
-    Runtime.getRuntime().addShutdownHook(new Thread() {
-      @Override
-      public void run() {
-        shutdown();
-      }
-    });
+
   }
 
   abstract void shutdown();

core/src/main/java/me/prettyprint/cassandra/connection/CassandraHostRetryService.java

@@ -31,9 +31,9 @@ public CassandraHostRetryService(HConnectionManager connectionManager,
     super(connectionManager, cassandraHostConfigurator);
     this.exceptionsTranslator = connectionManager.exceptionsTranslator;
     this.retryDelayInSeconds = cassandraHostConfigurator.getRetryDownedHostsDelayInSeconds();
-    downedHostQueue = new LinkedBlockingQueue<CassandraHost>(cassandraHostConfigurator.getRetryDownedHostsQueueSize() < 1 
+    downedHostQueue = new LinkedBlockingQueue<CassandraHost>(cassandraHostConfigurator.getRetryDownedHostsQueueSize() < 1
         ? Integer.MAX_VALUE : cassandraHostConfigurator.getRetryDownedHostsQueueSize());
-          
+
     sf = executor.scheduleWithFixedDelay(new RetryRunner(), this.retryDelayInSeconds,this.retryDelayInSeconds, TimeUnit.SECONDS);
 
     log.info("Downed Host Retry service started with queue size {} and retry delay {}s",
@@ -87,17 +87,16 @@ class RetryRunner implements Runnable {
     public void run() {
       CassandraHost cassandraHost = downedHostQueue.poll();
       if ( cassandraHost == null ) {
-        if ( log.isDebugEnabled() ) { 
+        if ( log.isDebugEnabled() ) {
           log.debug("Retry service fired... nothing to do.");
         }
         return;
       }
-      
+
       boolean reconnected = verifyConnection(cassandraHost);
       log.info("Downed Host retry status {} with host: {}", reconnected, cassandraHost.getName());
       if ( reconnected ) {
-        //cassandraClientPool.getCluster().addHost(cassandraHost, true);
-        connectionManager.addCassandraHost(cassandraHost);
+        reconnected = connectionManager.addCassandraHost(cassandraHost);
       }
       if ( !reconnected && cassandraHost != null ) {
         downedHostQueue.add(cassandraHost);
@@ -112,23 +111,20 @@ private boolean verifyConnection(CassandraHost cassandraHost) {
       boolean found = false;
       HThriftClient client = new HThriftClient(cassandraHost);
       try {
-        
+
         client.open();
         found = client.getCassandra().describe_cluster_name() != null;
-        client.close();              
-      } catch (HectorTransportException he) {        
+        client.close();
+      } catch (HectorTransportException he) {
         log.warn("Downed {} host still appears to be down: {}", cassandraHost, he.getMessage());
       } catch (Exception ex) {
-                
+
         log.error("Downed Host retry failed attempt to verify CassandraHost", ex);
-        
-      } 
+
+      }
       return found;
     }
 
   }
 
-  // TODO create callable to handle checking
-
-  // perhaps wrap CassandraHost and add a lastRetryTime?
 }

core/src/main/java/me/prettyprint/cassandra/connection/ConcurrentHClientPool.java

@@ -66,7 +66,7 @@ public HThriftClient borrowClient() throws HectorException {
       if ( tillExhausted > 0 ) {
         // if we start with #of threads == getMaxActive, we could trigger this condition
         // replace addClientToPoolGently(new HThriftClient(cassandraHost).open()) with immediate acquisition
-        return greedyCreate();        
+        return greedyCreate();
       }
       // blocked take on the queue if we are configured to wait forever
       if ( log.isDebugEnabled() ) {
@@ -109,7 +109,7 @@ public HThriftClient borrowClient() throws HectorException {
 
     return cassandraClient;
   }
-  
+
   /**
    * Used when we still have room to grow. Return an HThriftClient without
    * having to wait on polling logic. (But still increment all the counters)