提交 27a365b4 编写于 作者: A alanb

6824141: test/java/rmi/activation/rmidViaInheritedChannel tests fail

Reviewed-by: peterjones
上级 e2dedc65
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
*/ */
/* @test /* @test
* @bug 6261402 * @bug 6261402 6824141
* @summary If rmid has an inherited channel that is not a server * @summary If rmid has an inherited channel that is not a server
* socket (such as it if was started using rsh/rcmd), then it should * socket (such as it if was started using rsh/rcmd), then it should
* function normally. * function normally.
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
import java.io.IOException; import java.io.IOException;
import java.net.Socket; import java.net.Socket;
import java.net.ProtocolFamily;
import java.nio.channels.Channel; import java.nio.channels.Channel;
import java.nio.channels.DatagramChannel; import java.nio.channels.DatagramChannel;
import java.nio.channels.Pipe; import java.nio.channels.Pipe;
...@@ -137,6 +138,12 @@ public class InheritedChannelNotServerSocket { ...@@ -137,6 +138,12 @@ public class InheritedChannelNotServerSocket {
return provider.openDatagramChannel(); return provider.openDatagramChannel();
} }
public DatagramChannel openDatagramChannel(ProtocolFamily family)
throws IOException
{
return provider.openDatagramChannel(family);
}
public Pipe openPipe() throws IOException { public Pipe openPipe() throws IOException {
return provider.openPipe(); return provider.openPipe();
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
*/ */
/* @test /* @test
* @bug 4295885 * @bug 4295885 6824141
* @summary rmid should be startable from inetd * @summary rmid should be startable from inetd
* @author Ann Wollrath * @author Ann Wollrath
* *
...@@ -36,6 +36,7 @@ import java.io.IOException; ...@@ -36,6 +36,7 @@ import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.ProtocolFamily;
import java.nio.channels.*; import java.nio.channels.*;
import java.nio.channels.spi.*; import java.nio.channels.spi.*;
import java.rmi.Remote; import java.rmi.Remote;
...@@ -126,6 +127,12 @@ public class RmidViaInheritedChannel implements Callback { ...@@ -126,6 +127,12 @@ public class RmidViaInheritedChannel implements Callback {
return provider.openDatagramChannel(); return provider.openDatagramChannel();
} }
public DatagramChannel openDatagramChannel(ProtocolFamily family)
throws IOException
{
return provider.openDatagramChannel(family);
}
public Pipe openPipe() public Pipe openPipe()
throws IOException throws IOException
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册