[jbosscache-commits] JBoss Cache SVN: r8448 - in core/trunk/src/main/java/org/jboss/cache: marshall and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: dereed
Date: 2010-09-29 21:10:07 -0400 (Wed, 29 Sep 2010)
New Revision: 8448

Modified:
   core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
   core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
Log:
[JBCACHE-1590] Rename CommandAwareRpcDispatcher stop() to stopDispatcher() to avoid name conflict with parent class's method


Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2010-08-27 13:20:30 UTC (rev 8447)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2010-09-30 01:10:07 UTC (rev 8448)
@@ -510,7 +510,7 @@
       if (rpcDispatcher != null)
       {
          if (log.isInfoEnabled()) log.info("Stopping the RpcDispatcher");
-         rpcDispatcher.stop();
+         rpcDispatcher.stopDispatcher();
       }
 
       if (members != null) members = null;

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java	2010-08-27 13:20:30 UTC (rev 8447)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java	2010-09-30 01:10:07 UTC (rev 8448)
@@ -155,8 +155,9 @@
       return enforceSerialMarshalling;
    }
 
-   @Override
-   public void stop()
+   /* JBCACHE-1590 - method can't be named "stop" because that's already 
+    * used by the parent class for its own purposes.  */
+   public void stopDispatcher()
    {
       replicationProcessor.shutdownNow();
       try
@@ -167,7 +168,6 @@
       {
          Thread.currentThread().interrupt();
       }
-      super.stop();
    }
 
    protected boolean isValid(Message req)