svn commit: r1359770 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java

[ecn]

Author: ecn
Date: Tue Jul 10 16:39:58 2012
New Revision: 1359770

URL: http://svn.apache.org/viewvc?rev=1359770&view=rev
Log:
ACCUMULO-678 merge to 1.4 branch, but leaving out the new tests

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1359620

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1359620
  Merged /accumulo/trunk:r1359620

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1359620
  Merged /accumulo/trunk/core:r1359620

Modified: 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java?rev=1359770&r1=1359769&r2=1359770&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java
 (original)
+++ 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java
 Tue Jul 10 16:39:58 2012
@@ -66,7 +66,7 @@ public class ShutdownTServer extends Mas
     // TODO move this to isReady() and drop while loop?
     Listener listener = m.getEventCoordinator().getListener();
     m.shutdownTServer(server);
-    while (m.stillMaster() && m.onlineTabletServers().contains(server)) {
+    while (m.onlineTabletServers().contains(server)) {
       TServerConnection connection = m.getConnection(server);
       if (connection != null) {
         try {