Return-Path: 
 <cassandra-commits-return-8002-apmail-incubator-cassandra-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org
Received: (qmail 24739 invoked from network); 5 Jan 2010 04:06:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 5 Jan 2010 04:06:17 -0000
Received: (qmail 42831 invoked by uid 500); 5 Jan 2010 04:06:17 -0000
Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org
Received: (qmail 42799 invoked by uid 500); 5 Jan 2010 04:06:16 -0000
Mailing-List: contact cassandra-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cassandra-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cassandra-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cassandra-commits@incubator.apache.org>
List-Id: <cassandra-commits.incubator.apache.org>
Reply-To: cassandra-dev@incubator.apache.org
Delivered-To: mailing list cassandra-commits@incubator.apache.org
Received: (qmail 42789 invoked by uid 99); 5 Jan 2010 04:06:16 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 04:06:16 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 04:06:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B2EA22388A18; Tue,  5 Jan 2010 04:05:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r895887 -
 /incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
Date: Tue, 05 Jan 2010 04:05:55 -0000
To: cassandra-commits@incubator.apache.org
From: jbellis@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100105040555.B2EA22388A18@eris.apache.org>

Author: jbellis
Date: Tue Jan  5 04:05:54 2010
New Revision: 895887

URL: http://svn.apache.org/viewvc?rev=895887&view=rev
Log:
r/m unused "reservedverbs" code
patch by jbellis; reviewed by gdusbabek for CASSANDRA-659

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.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=895887&r1=895886&r2=895887&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 Tue Jan  5 04:05:54 2010
@@ -53,11 +53,6 @@
     /* Stage for responses. */
     public static final String responseStage_ = "RESPONSE-STAGE";
 
-    private enum ReservedVerbs_ {
-    };
-    
-    private static Map<String, String> reservedVerbs_ = new Hashtable<String, String>();
-    
     /* This records all the results mapped by message Id */
     private static ICachetable<String, IAsyncCallback> callbackMap_;
     private static ICachetable<String, IAsyncResult> taskCompletionMap_;
@@ -128,11 +123,7 @@
 
     protected MessagingService()
     {        
-        for ( ReservedVerbs_ verbs : ReservedVerbs_.values() )
-        {
-            reservedVerbs_.put(verbs.toString(), verbs.toString());
-        }
-        verbHandlers_ = new HashMap<String, IVerbHandler>();        
+        verbHandlers_ = new HashMap<String, IVerbHandler>();
         endPoints_ = new HashSet<InetAddress>();
         /*
          * Leave callbacks in the cachetable long enough that any related messages will arrive
@@ -260,15 +251,7 @@
     {
         return getConnectionPool(from, to).getConnection(msg);
     }
-    
-    private void checkForReservedVerb(String type)
-    {
-    	if ( reservedVerbs_.get(type) != null && verbHandlers_.get(type) != null )
-    	{
-    		throw new IllegalArgumentException( type + " is a reserved verb handler. Scram!");
-    	}
-    }     
-    
+        
     /**
      * Register a verb and the corresponding verb handler with the
      * Messaging Service.
@@ -277,7 +260,7 @@
      */
     public void registerVerbHandlers(String type, IVerbHandler verbHandler)
     {
-    	checkForReservedVerb(type);
+    	assert !verbHandlers_.containsKey(type);
     	verbHandlers_.put(type, verbHandler);
     }