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 B37A9104ED for ; Fri, 4 Oct 2013 03:20:10 +0000 (UTC) Received: (qmail 34716 invoked by uid 500); 4 Oct 2013 03:20:07 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 34490 invoked by uid 500); 4 Oct 2013 03:20:05 -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 34454 invoked by uid 99); 4 Oct 2013 03:20:04 -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, 04 Oct 2013 03:20:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A883490F3B4; Fri, 4 Oct 2013 03:20:03 +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 Date: Fri, 04 Oct 2013 03:20:03 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: last one? Updated Branches: refs/heads/cassandra-1.2 adb3a0dd7 -> 731e83b7f refs/heads/cassandra-2.0 ef69bd532 -> 213f6bb88 refs/heads/trunk 53ac6b203 -> 6dda6f2d8 last one? Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/731e83b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/731e83b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/731e83b7 Branch: refs/heads/cassandra-1.2 Commit: 731e83b7ffd764ad98405e130e00ada0d08d6b45 Parents: adb3a0d Author: Jonathan Ellis Authored: Thu Oct 3 22:19:15 2013 -0500 Committer: Jonathan Ellis Committed: Thu Oct 3 22:19:15 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/731e83b7/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index ec33723..c0b7271 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -665,7 +665,7 @@ public class StorageProxy implements StorageProxyMBean message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray()); // send the combined message + forward headers Tracing.trace("Enqueuing message to {}", target); - MessagingService.instance().sendRR(message, target, handler); + MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel); } private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler)