You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/01/27 17:24:08 UTC
svn commit: r1064183 - in /cassandra/trunk: lib/jetty-6.1.24.jar
lib/jetty-util-6.1.24.jar
src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
Author: jbellis
Date: Thu Jan 27 16:24:07 2011
New Revision: 1064183
URL: http://svn.apache.org/viewvc?rev=1064183&view=rev
Log:
r/m jetty
patch by Nate McCall; reviewed by stuhood for CASSANDRA-2050
Removed:
cassandra/trunk/lib/jetty-6.1.24.jar
cassandra/trunk/lib/jetty-util-6.1.24.jar
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java?rev=1064183&r1=1064182&r2=1064183&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java Thu Jan 27 16:24:07 2011
@@ -45,7 +45,6 @@ import org.apache.cassandra.db.migration
import org.apache.cassandra.utils.CLibrary;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Mx4jTool;
-import org.mortbay.thread.ThreadPool;
/**
* The <code>CassandraDaemon</code> is an abstraction for a Cassandra daemon
@@ -349,7 +348,7 @@ public abstract class AbstractCassandraD
* A subclass of Java's ThreadPoolExecutor which implements Jetty's ThreadPool
* interface (for integration with Avro), and performs ClientState cleanup.
*/
- public static class CleaningThreadPool extends ThreadPoolExecutor implements ThreadPool
+ public static class CleaningThreadPool extends ThreadPoolExecutor
{
private ThreadLocal<ClientState> state;
public CleaningThreadPool(ThreadLocal<ClientState> state, int minWorkerThread, int maxWorkerThreads)
@@ -365,42 +364,6 @@ public abstract class AbstractCassandraD
state.get().logout();
}
- /*********************************************************************/
- /** The following are cribbed from org.mortbay.thread.concurrent */
- /*********************************************************************/
-
- public boolean dispatch(Runnable job)
- {
- try
- {
- execute(job);
- return true;
- }
- catch(RejectedExecutionException e)
- {
- logger.error("Failed to dispatch thread:", e);
- return false;
- }
- }
- public int getIdleThreads()
- {
- return getPoolSize()-getActiveCount();
- }
-
- public int getThreads()
- {
- return getPoolSize();
- }
-
- public boolean isLowOnThreads()
- {
- return getActiveCount()>=getMaximumPoolSize();
- }
-
- public void join() throws InterruptedException
- {
- this.awaitTermination(Long.MAX_VALUE,TimeUnit.MILLISECONDS);
- }
}
}