Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 24011 invoked from network); 29 Jan 2010 23:47:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Jan 2010 23:47:36 -0000 Received: (qmail 57500 invoked by uid 500); 29 Jan 2010 23:47:36 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 57483 invoked by uid 500); 29 Jan 2010 23:47:36 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 57473 invoked by uid 99); 29 Jan 2010 23:47:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jan 2010 23:47:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 29 Jan 2010 23:47:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 51F1723888EC; Fri, 29 Jan 2010 23:47:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r904677 - /incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java Date: Fri, 29 Jan 2010 23:47:15 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100129234715.51F1723888EC@eris.apache.org> Author: jbellis Date: Fri Jan 29 23:47:14 2010 New Revision: 904677 URL: http://svn.apache.org/viewvc?rev=904677&view=rev Log: avoid setting up completion handler for no-op stream in non-bootstrap mode. patch by jbellis; reviewed by gdusbabek for CASSANDRA-750 Modified: incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java Modified: incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java?rev=904677&r1=904676&r2=904677&view=diff ============================================================================== --- incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java (original) +++ incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java Fri Jan 29 23:47:14 2010 @@ -173,11 +173,12 @@ StreamInitiateMessage biMsg = StreamInitiateMessage.serializer().deserialize(bufIn); StreamContextManager.StreamContext[] streamContexts = biMsg.getStreamContext(); - if (streamContexts.length == 0 && StorageService.instance().isBootstrapMode()) + if (streamContexts.length == 0) { if (logger.isDebugEnabled()) logger.debug("no data needed from " + message.getFrom()); - StorageService.instance().removeBootstrapSource(message.getFrom(), new String(message.getHeader(Streaming.TABLE_NAME))); + if (StorageService.instance().isBootstrapMode()) + StorageService.instance().removeBootstrapSource(message.getFrom(), new String(message.getHeader(Streaming.TABLE_NAME))); return; }