Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 62354 invoked from network); 27 Mar 2009 02:23:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Mar 2009 02:23:15 -0000 Received: (qmail 17268 invoked by uid 500); 27 Mar 2009 02:23:07 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 17167 invoked by uid 500); 27 Mar 2009 02:23:07 -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 14723 invoked by uid 99); 27 Mar 2009 02:19:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Mar 2009 02:19:29 +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, 27 Mar 2009 02:19:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7813C238889D; Fri, 27 Mar 2009 02:19:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r758972 - /incubator/cassandra/trunk/src/org/apache/cassandra/net/Message.java Date: Fri, 27 Mar 2009 02:19:06 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090327021906.7813C238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Fri Mar 27 02:19:06 2009 New Revision: 758972 URL: http://svn.apache.org/viewvc?rev=758972&view=rev Log: change Object[] to Object... so passing a single one is easier Modified: incubator/cassandra/trunk/src/org/apache/cassandra/net/Message.java Modified: incubator/cassandra/trunk/src/org/apache/cassandra/net/Message.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/net/Message.java?rev=758972&r1=758971&r2=758972&view=diff ============================================================================== --- incubator/cassandra/trunk/src/org/apache/cassandra/net/Message.java (original) +++ incubator/cassandra/trunk/src/org/apache/cassandra/net/Message.java Fri Mar 27 02:19:06 2009 @@ -53,27 +53,20 @@ Header header_; private Object[] body_ = new Object[0]; - /* Ctor for JAXB. DO NOT DELETE */ - private Message() + protected Message(String id, EndPoint from, String messageType, String verb, Object... body) { - } - - protected Message(String id, EndPoint from, String messageType, String verb, Object[] body) - { - header_ = new Header(id, from, messageType, verb); - body_ = body; + this(new Header(id, from, messageType, verb), body); } - protected Message(Header header, Object[] body) + protected Message(Header header, Object... body) { header_ = header; body_ = body; } - public Message(EndPoint from, String messageType, String verb, Object[] body) + public Message(EndPoint from, String messageType, String verb, Object... body) { - header_ = new Header(from, messageType, verb); - body_ = body; + this(new Header(from, messageType, verb), body); } public byte[] getHeader(Object key) @@ -164,7 +157,7 @@ header_.setMessageId(id); } - public Message getReply(EndPoint from, Object[] args) + public Message getReply(EndPoint from, Object... args) { Message response = new Message(getMessageId(), from,