Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 60426 invoked from network); 14 Jul 2006 11:24:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Jul 2006 11:24:10 -0000 Received: (qmail 41936 invoked by uid 500); 14 Jul 2006 11:24:10 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 41907 invoked by uid 500); 14 Jul 2006 11:24:10 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 41887 invoked by uid 99); 14 Jul 2006 11:24:10 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2006 04:24:10 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2006 04:24:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 325EB1A981A; Fri, 14 Jul 2006 04:23:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r421870 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/net/Socket.java main/java/org/apache/harmony/luni/util/ExternalMessages.properties test/java/tests/api/java/net/SocketTest.java Date: Fri, 14 Jul 2006 11:23:48 -0000 To: harmony-commits@incubator.apache.org From: gharley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060714112349.325EB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: gharley Date: Fri Jul 14 04:23:47 2006 New Revision: 421870 URL: http://svn.apache.org/viewvc?rev=421870&view=rev Log: HARMONY 873 : [luni] java.net.Socket.getOutputStream should throw SocketException if output has been shutdown Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Socket.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/SocketTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Socket.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Socket.java?rev=421870&r1=421869&r2=421870&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Socket.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Socket.java Fri Jul 14 04:23:47 2006 @@ -402,6 +402,9 @@ */ public OutputStream getOutputStream() throws IOException { checkClosedAndCreate(false); + if (isOutputShutdown()) { + throw new SocketException(Msg.getString("KA00f")); + } return impl.getOutputStream(); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties?rev=421870&r1=421869&r2=421870&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties Fri Jul 14 04:23:47 2006 @@ -300,4 +300,4 @@ KA00c=Readable is null KA00d=ReadableByteChannel is null KA00e=Radix {0} is less than Character.MIN_RADIX or greater than Character.MAX_RADIX - +KA00f=Socket output is shutdown Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/SocketTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/SocketTest.java?rev=421870&r1=421869&r2=421870&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/SocketTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/SocketTest.java Fri Jul 14 04:23:47 2006 @@ -2397,6 +2397,23 @@ // expected } } + + /** + * @tests Socket#getOutputStream() + */ + public void test_getOutputStream_shutdownOutput() throws Exception { + // regression test for Harmony-873 + ServerSocket ss = new ServerSocket(0); + Socket s = new Socket("127.0.0.1", ss.getLocalPort()); + ss.accept(); + s.shutdownOutput(); + try { + s.getOutputStream(); + fail("should throw SocketException"); + } catch (SocketException e) { + // expected + } + } /** * Sets up the fixture, for example, open a network connection. This method