svn commit: r900467 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: net/MessagingService.java utils/FBUtilities.java utils/HashingSchemes.java

[jbellis]

Author: jbellis
Date: Mon Jan 18 17:17:49 2010
New Revision: 900467

URL: http://svn.apache.org/viewvc?rev=900467&view=rev
Log:
inline HashingSchemes constants.  patch by jbellis

Removed:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/HashingSchemes.java
Modified:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=900467&r1=900466&r2=900467&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
 Mon Jan 18 17:17:49 2010
@@ -137,7 +137,7 @@
 
         streamExecutor_ = new 
JMXEnabledThreadPoolExecutor("MESSAGE-STREAMING-POOL");
                 
-        protocol_ = hash(HashingSchemes.MD5, "FB-MESSAGING".getBytes());       
 
+        protocol_ = hash("MD5", "FB-MESSAGING".getBytes());        
         /* register the response verb handler */
         registerVerbHandlers(MessagingService.responseVerbHandler_, new 
ResponseVerbHandler());
     }

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=900467&r1=900466&r2=900467&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java 
Mon Jan 18 17:17:49 2010
@@ -177,7 +177,7 @@
 
     public static BigInteger hash(String data)
     {
-        byte[] result = hash(HashingSchemes.MD5, data.getBytes());
+        byte[] result = hash("MD5", data.getBytes());
         BigInteger hash = new BigInteger(result);
         return hash.abs();        
     }