Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0A589ECDF for ; Wed, 13 Mar 2013 15:03:51 +0000 (UTC) Received: (qmail 76322 invoked by uid 500); 13 Mar 2013 15:03:51 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 76292 invoked by uid 500); 13 Mar 2013 15:03:50 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 76279 invoked by uid 99); 13 Mar 2013 15:03:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Mar 2013 15:03:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Mar 2013 15:03:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6A2F6238897F; Wed, 13 Mar 2013 15:03:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1455982 - 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... Date: Wed, 13 Mar 2013 15:03:16 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130313150316.6A2F6238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Wed Mar 13 15:03:15 2013 New Revision: 1455982 URL: http://svn.apache.org/r1455982 Log: ACCUMULO-1173 reverting setting thread state 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:r1455980 Propchange: accumulo/branches/1.4.3/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1455980 Propchange: accumulo/branches/1.4.3/src/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/core:r1455980 Propchange: accumulo/branches/1.4.3/src/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/server:r1455980 Propchange: accumulo/branches/1.4.3/src/server/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/server/src:r1455980 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:r1455980 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=1455982&r1=1455981&r2=1455982&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 Wed Mar 13 15:03:15 2013 @@ -54,7 +54,6 @@ 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; @@ -169,13 +168,6 @@ 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:r1455980