Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 56B19C541 for ; Fri, 13 Jul 2012 16:32:49 +0000 (UTC) Received: (qmail 15654 invoked by uid 500); 13 Jul 2012 16:32:49 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 15629 invoked by uid 500); 13 Jul 2012 16:32:49 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 15621 invoked by uid 99); 13 Jul 2012 16:32:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2012 16:32:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CBBA913B42; Fri, 13 Jul 2012 16:32:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: CS.schedule throws UE instead of TOE patch by jbellis; reviewed by slebresne for CASSANDRA-4414 Message-Id: <20120713163247.CBBA913B42@tyr.zones.apache.org> Date: Fri, 13 Jul 2012 16:32:47 +0000 (UTC) Updated Branches: refs/heads/trunk 2f4c7c4dc -> 13f8eee99 CS.schedule throws UE instead of TOE patch by jbellis; reviewed by slebresne for CASSANDRA-4414 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13f8eee9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13f8eee9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13f8eee9 Branch: refs/heads/trunk Commit: 13f8eee99d0acb7063eab5dab7a8980d1b71a3b9 Parents: c9a13c3 Author: Jonathan Ellis Authored: Wed Jul 11 23:29:37 2012 -0500 Committer: Jonathan Ellis Committed: Fri Jul 13 11:32:21 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/thrift/CassandraServer.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13f8eee9/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 15084c6..e594236 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -893,9 +893,16 @@ public class CassandraServer implements Cassandra.Iface /** * Schedule the current thread for access to the required services */ - private void schedule(long timeoutMS) throws TimeoutException + private void schedule(long timeoutMS) throws UnavailableException { - requestScheduler.queue(Thread.currentThread(), state().getSchedulingValue(), timeoutMS); + try + { + requestScheduler.queue(Thread.currentThread(), state().getSchedulingValue(), timeoutMS); + } + catch (TimeoutException e) + { + throw new UnavailableException(); + } } /**