[Bigdata-commit] SF.net SVN: bigdata:[7625] branches

[<tho...@us...>]

Revision: 7625
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7625&view=rev
Author:   thompsonbry
Date:     2013-12-09 16:06:45 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Removed the no longer used memberRemoveInterruptably() method.  This method used to be used in AbstractQuorum.terminate().  It was probably removed from use when we did the ZK disconnect refactor.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
    branches/MGC_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java	2013-12-09 16:04:03 UTC (rev 7624)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java	2013-12-09 16:06:45 UTC (rev 7625)
@@ -1860,22 +1860,22 @@
             }
         }
 
-        /**
-         * An interruptable version of {@link #memberRemove()}.
-         * <p>
-         * Note: This is used by {@link AbstractQuorum#terminate()}. That code
-         * is already holding the lock in the caller's thread. Therefore it
-         * needs to run these operations in the same thread to avoid a deadlock
-         * with itself.
-         */
-        protected void memberRemoveInterruptable() throws InterruptedException {
-            if (!lock.isHeldByCurrentThread())
-                throw new IllegalMonitorStateException();
-            conditionalServiceLeaveImpl();
-            conditionalPipelineRemoveImpl();
-            conditionalWithdrawVoteImpl();
-            conditionalMemberRemoveImpl();
-        }
+//        /**
+//         * An interruptable version of {@link #memberRemove()}.
+//         * <p>
+//         * Note: This is used by {@link AbstractQuorum#terminate()}. That code
+//         * is already holding the lock in the caller's thread. Therefore it
+//         * needs to run these operations in the same thread to avoid a deadlock
+//         * with itself.
+//         */
+//        protected void memberRemoveInterruptable() throws InterruptedException {
+//            if (!lock.isHeldByCurrentThread())
+//                throw new IllegalMonitorStateException();
+//            conditionalServiceLeaveImpl();
+//            conditionalPipelineRemoveImpl();
+//            conditionalWithdrawVoteImpl();
+//            conditionalMemberRemoveImpl();
+//        }
 
         @Override
         final public void withdrawVote() {

Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java	2013-12-09 16:04:03 UTC (rev 7624)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java	2013-12-09 16:06:45 UTC (rev 7625)
@@ -1860,22 +1860,22 @@
             }
         }
 
-        /**
-         * An interruptable version of {@link #memberRemove()}.
-         * <p>
-         * Note: This is used by {@link AbstractQuorum#terminate()}. That code
-         * is already holding the lock in the caller's thread. Therefore it
-         * needs to run these operations in the same thread to avoid a deadlock
-         * with itself.
-         */
-        protected void memberRemoveInterruptable() throws InterruptedException {
-            if (!lock.isHeldByCurrentThread())
-                throw new IllegalMonitorStateException();
-            conditionalServiceLeaveImpl();
-            conditionalPipelineRemoveImpl();
-            conditionalWithdrawVoteImpl();
-            conditionalMemberRemoveImpl();
-        }
+//        /**
+//         * An interruptable version of {@link #memberRemove()}.
+//         * <p>
+//         * Note: This is used by {@link AbstractQuorum#terminate()}. That code
+//         * is already holding the lock in the caller's thread. Therefore it
+//         * needs to run these operations in the same thread to avoid a deadlock
+//         * with itself.
+//         */
+//        protected void memberRemoveInterruptable() throws InterruptedException {
+//            if (!lock.isHeldByCurrentThread())
+//                throw new IllegalMonitorStateException();
+//            conditionalServiceLeaveImpl();
+//            conditionalPipelineRemoveImpl();
+//            conditionalWithdrawVoteImpl();
+//            conditionalMemberRemoveImpl();
+//        }
 
         @Override
         final public void withdrawVote() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.