Return-Path: X-Original-To: apmail-avro-commits-archive@www.apache.org Delivered-To: apmail-avro-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 618C86522 for ; Thu, 30 Jun 2011 19:55:53 +0000 (UTC) Received: (qmail 11653 invoked by uid 500); 30 Jun 2011 19:55:53 -0000 Delivered-To: apmail-avro-commits-archive@avro.apache.org Received: (qmail 11609 invoked by uid 500); 30 Jun 2011 19:55:52 -0000 Mailing-List: contact commits-help@avro.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@avro.apache.org Delivered-To: mailing list commits@avro.apache.org Received: (qmail 11592 invoked by uid 99); 30 Jun 2011 19:55:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jun 2011 19:55:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 30 Jun 2011 19:55:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 584F523889E0 for ; Thu, 30 Jun 2011 19:55:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1141690 - in /avro/branches/branch-1.5: ./ CHANGES.txt lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java Date: Thu, 30 Jun 2011 19:55:29 -0000 To: commits@avro.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110630195529.584F523889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cutting Date: Thu Jun 30 19:55:28 2011 New Revision: 1141690 URL: http://svn.apache.org/viewvc?rev=1141690&view=rev Log: Merge changes 1079680 and 1141685 from trunk to 1.5 branch. Fixes: AVRO-776. Modified: avro/branches/branch-1.5/ (props changed) avro/branches/branch-1.5/CHANGES.txt avro/branches/branch-1.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java Propchange: avro/branches/branch-1.5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 30 19:55:28 2011 @@ -1 +1 @@ -/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1099257,1102332,1102335,1124127,1124971,1129053,1129071,1129697-1129706,1129729,1130503,1136342,1141677 +/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1079680,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1099257,1102332,1102335,1124127,1124971,1129053,1129071,1129697-1129706,1129729,1130503,1136342,1141677,1141685 Modified: avro/branches/branch-1.5/CHANGES.txt URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1141690&r1=1141689&r2=1141690&view=diff ============================================================================== --- avro/branches/branch-1.5/CHANGES.txt (original) +++ avro/branches/branch-1.5/CHANGES.txt Thu Jun 30 19:55:28 2011 @@ -45,6 +45,8 @@ Avro 1.5.2 (unreleased) Implemented writeBuffers for the NettyTransceiver to allow it to process one-way messages. + AVRO-776. Java: Fix SocketServer to close socket. + Avro 1.5.1 (3 May 2011) NEW FEATURES Modified: avro/branches/branch-1.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java?rev=1141690&r1=1141689&r2=1141690&view=diff ============================================================================== --- avro/branches/branch-1.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java (original) +++ avro/branches/branch-1.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java Thu Jun 30 19:55:28 2011 @@ -83,6 +83,7 @@ public class SocketServer extends Thread } public void close() { + this.interrupt(); group.interrupt(); }