[prev in list] [next in list] [prev in thread] [next in thread] 

List:       avro-commits
Subject:    svn commit: r1141690 - in /avro/branches/branch-1.5: ./ CHANGES.txt lang/java/ipc/src/main/java/org/
From:       cutting () apache ! org
Date:       2011-06-30 19:55:29
Message-ID: 20110630195529.584F523889E0 () eris ! apache ! org
[Download RAW message or body]

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,1 \
086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128 \
,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,10979 \
16,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,108779 \
2,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096 \
798,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();
   }
 


[prev in list] [next in list] [prev in thread] [next in thread]