test/java/nio/channels/SocketChannel/Stream.java

*** 1,7 ****
  /*
!  * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 25,50 ****
   * @bug 4430139
   * @summary Test result of read on stream from nonblocking channel
   * @library ..
   */
  
- import java.net.*;
  import java.io.*;
! import java.nio.*;
  import java.nio.channels.*;
- import java.nio.charset.*;
  
  
  public class Stream {
  
!     static final int DAYTIME_PORT = 13;
!     static final String DAYTIME_HOST = TestUtil.HOST;
! 
!     static void test() throws Exception {
!         InetSocketAddress isa
!             = new InetSocketAddress(InetAddress.getByName(DAYTIME_HOST),
!                                     DAYTIME_PORT);
          SocketChannel sc = SocketChannel.open();
          sc.connect(isa);
          sc.configureBlocking(false);
          InputStream is = sc.socket().getInputStream();
          byte b[] = new byte[10];
--- 25,44 ----
   * @bug 4430139
   * @summary Test result of read on stream from nonblocking channel
   * @library ..
   */
  
  import java.io.*;
! import java.net.*;
  import java.nio.channels.*;
  
  
  public class Stream {
  
!     static void test(TestUtil.DayTimeServer daytimeServer) throws Exception {
!         InetSocketAddress isa = new InetSocketAddress(daytimeServer.getAddress(),
!                 daytimeServer.getPort());
          SocketChannel sc = SocketChannel.open();
          sc.connect(isa);
          sc.configureBlocking(false);
          InputStream is = sc.socket().getInputStream();
          byte b[] = new byte[10];
*** 56,64 ****
          }
          sc.close();
      }
  
      public static void main(String[] args) throws Exception {
!         test();
      }
- 
  }
--- 50,60 ----
          }
          sc.close();
      }
  
      public static void main(String[] args) throws Exception {
!         try (TestUtil.DayTimeServer dayTimeServer =
!                         TestUtil.DayTimeServer.startNewServer(100)) {
!             test(dayTimeServer);
!         }
      }
  }