[jboss-cvs] JBossAS SVN: r77448 - in trunk/cluster/src: main/org/jboss/ha/framework/server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-08-25 12:31:37 -0400 (Mon, 25 Aug 2008)
New Revision: 77448

Modified:
   trunk/cluster/src/etc/cluster-jboss-beans.xml
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java
Log:
[JBAS-5821] Get rid of ClusterPartition deadlock detection config

Modified: trunk/cluster/src/etc/cluster-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/cluster-jboss-beans.xml	2008-08-25 16:25:41 UTC (rev 77447)
+++ trunk/cluster/src/etc/cluster-jboss-beans.xml	2008-08-25 16:31:37 UTC (rev 77448)
@@ -26,9 +26,6 @@
          
       <!-- The address used to determine the node name -->
       <property name="nodeAddress">${jboss.bind.address}</property>
-         
-      <!-- Determine if deadlock detection is enabled -->
-      <property name="deadlockDetection">false</property>
               
       <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
       <property name="stateTransferTimeout">30000</property>

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2008-08-25 16:25:41 UTC (rev 77447)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2008-08-25 16:31:37 UTC (rev 77448)
@@ -184,7 +184,6 @@
    private   ChannelFactory channelFactory;
    private   String stackName;
    private   String partitionName = ServerConfigUtil.getDefaultPartitionName();
-   private   boolean deadlock_detection = false;
    private   InetAddress nodeAddress = null;
    private   long state_transfer_timeout=60000;
    private   long method_call_timeout=60000;
@@ -336,7 +335,7 @@
       this.log.info("Initializing partition " + this.getPartitionName());
       this.logHistory ("Initializing partition " + this.getPartitionName());
       
-      this.dispatcher = new RpcHandler(this.channel, null, null, new Object(), this.getDeadlockDetection());
+      this.dispatcher = new RpcHandler(this.channel, null, null, new Object(), false);
       
       // Subscribe to events generated by the channel
       this.log.debug("setMembershipListener");
@@ -1589,15 +1588,31 @@
    {
       return this.cache;
    }
-   
+
+   /**
+    * Deprecated; always returns <code>false</code>.
+    * 
+    * @return <code>false</code>
+    * 
+    * @deprecated will be removed in next major release
+    */
+   @Deprecated
    public boolean getDeadlockDetection()
    {
-      return this.deadlock_detection;
+      return false;
    }
 
+   /**
+    * Deprecated; logs a WARN message if invoked.
+    * 
+    * @param doIt ignored
+    * 
+    * @deprecated will be removed in next major release
+    */
+   @Deprecated
    public void setDeadlockDetection(boolean doit)
    {
-      this.deadlock_detection = doit;
+      log.warn("Property deadlockDetection has been deprecated; setting it has no effect");
    }
 
    public HAPartition getHAPartition()

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java	2008-08-25 16:25:41 UTC (rev 77447)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java	2008-08-25 16:31:37 UTC (rev 77448)
@@ -83,8 +83,13 @@
    void setMethodCallTimeout(long timeout);
 
    /**
-    * Determine if deadlock detection is enabled
+    * Deprecated; always returns <code>false</code>.
+    * 
+    * @return <code>false</code>
+    * 
+    * @deprecated will be removed in next major release
     */
+   @Deprecated
    boolean getDeadlockDetection();
    
    /**