svn commit: r1455640 - in /accumulo/branches/1.4.3: ./ src/ src/core/ src/server/ src/server/src/ src/server/src/main/java/org/apache/accumulo/server/test/functional/ src/server/src/main/java/org/apache/accumulo/server/trace/ src/server/src/main/java/o...

[ecn]

Author: ecn
Date: Tue Mar 12 17:30:45 2013
New Revision: 1455640

URL: http://svn.apache.org/r1455640
Log:
ACCUMULO-1173 ensure that threads serving requests are Daemonized

Modified:
    accumulo/branches/1.4.3/   (props changed)
    accumulo/branches/1.4.3/src/   (props changed)
    accumulo/branches/1.4.3/src/core/   (props changed)
    accumulo/branches/1.4.3/src/server/   (props changed)
    accumulo/branches/1.4.3/src/server/src/   (props changed)
    
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/
   (props changed)
    
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
   (props changed)

Propchange: accumulo/branches/1.4.3/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4:r1455639

Propchange: accumulo/branches/1.4.3/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1455639

Propchange: accumulo/branches/1.4.3/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/core:r1455639

Propchange: accumulo/branches/1.4.3/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/server:r1455639

Propchange: accumulo/branches/1.4.3/src/server/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/server/src:r1455639

Propchange: 
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1455639

Modified: 
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1455640&r1=1455639&r2=1455640&view=diff
==============================================================================
--- 
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
 (original)
+++ 
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
 Tue Mar 12 17:30:45 2013
@@ -54,6 +54,7 @@ import org.apache.thrift.transport.TServ
 import org.apache.thrift.transport.TServerTransport;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.TTransportFactory;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
@@ -168,6 +169,13 @@ public class TraceServer implements Watc
     sock.bind(new InetSocketAddress(port));
     final TServerTransport transport = new TServerSocket(sock);
     TThreadPoolServer.Args options = new TThreadPoolServer.Args(transport);
+    options.transportFactory(new TTransportFactory() {
+      @Override
+      public TTransport getTransport(TTransport trans) {
+        Thread.currentThread().setDaemon(true);
+        return super.getTransport(trans);
+      }
+    });
     options.processor(new SpanReceiver.Processor(new Receiver()));
     server = new TThreadPoolServer(options);
     final InetSocketAddress address = new 
InetSocketAddress(Accumulo.getLocalAddress(args), sock.getLocalPort());

Propchange: 
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java:r1455639