You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/13 16:03:16 UTC
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...
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