Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 32717 invoked from network); 28 Jul 2009 21:41:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Jul 2009 21:41:20 -0000 Received: (qmail 38224 invoked by uid 500); 28 Jul 2009 21:41:21 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 38168 invoked by uid 500); 28 Jul 2009 21:41:21 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 38141 invoked by uid 99); 28 Jul 2009 21:41:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jul 2009 21:41:20 +0000 X-ASF-Spam-Status: No, hits=-1998.8 required=10.0 tests=ALL_TRUSTED,FS_REPLICA 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; Tue, 28 Jul 2009 21:41:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2514523888CF; Tue, 28 Jul 2009 21:40:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r798715 - in /db/derby/code/branches/10.5: ./ java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java Date: Tue, 28 Jul 2009 21:40:55 -0000 To: derby-commits@db.apache.org From: dag@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090728214056.2514523888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dag Date: Tue Jul 28 21:40:55 2009 New Revision: 798715 URL: http://svn.apache.org/viewvc?rev=798715&view=rev Log: DERBY-4185 Make timeout settable or increase default for one replication message layer protocol. Backported this fix to 10.5 branch as svn merge -c 769606 https://svn.eu.apache.org/repos/asf/db/derby/code/trunk Modified: db/derby/code/branches/10.5/ (props changed) db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java Propchange: db/derby/code/branches/10.5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 28 21:40:55 2009 @@ -1 +1 @@ -/db/derby/code/trunk:769596,769602,769962,772090,772337,772449,772534,774281,779681,782991,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793588,794955,795166,796020,796027,797147 +/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,779681,782991,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793588,794955,795166,796020,796027,797147 Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java?rev=798715&r1=798714&r2=798715&view=diff ============================================================================== --- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java (original) +++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java Tue Jul 28 21:40:55 2009 @@ -43,7 +43,7 @@ /** Number of millis to wait for a response message before timing out */ - private final int DEFAULT_MESSAGE_RESPONSE_TIMEOUT = 5000; + private final int DEFAULT_MESSAGE_RESPONSE_TIMEOUT = 30000; /** The thread that listens for messages from the slave */ private Thread msgReceiver = null;