From 27a365b454e86188f9faddfb58a7707d79b07723 Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Thu, 2 Apr 2009 16:31:44 +0100
Subject: [PATCH] 6824141: test/java/rmi/activation/rmidViaInheritedChannel
 tests fail Reviewed-by: peterjones

---
 .../InheritedChannelNotServerSocket.java                 | 9 ++++++++-
 .../rmidViaInheritedChannel/RmidViaInheritedChannel.java | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java
index 301c6a66f..0faa5ed7e 100644
--- a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java
+++ b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 6261402
+ * @bug 6261402 6824141
  * @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
  * function normally.
@@ -37,6 +37,7 @@
 
 import java.io.IOException;
 import java.net.Socket;
+import java.net.ProtocolFamily;
 import java.nio.channels.Channel;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.Pipe;
@@ -137,6 +138,12 @@ public class InheritedChannelNotServerSocket {
             return provider.openDatagramChannel();
         }
 
+        public DatagramChannel openDatagramChannel(ProtocolFamily family)
+            throws IOException
+        {
+            return provider.openDatagramChannel(family);
+        }
+
         public Pipe openPipe() throws IOException {
             return provider.openPipe();
         }
diff --git a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java
index c37dd6250..79265dd8e 100644
--- a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java
+++ b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4295885
+ * @bug 4295885 6824141
  * @summary rmid should be startable from inetd
  * @author Ann Wollrath
  *
@@ -36,6 +36,7 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
+import java.net.ProtocolFamily;
 import java.nio.channels.*;
 import java.nio.channels.spi.*;
 import java.rmi.Remote;
@@ -126,6 +127,12 @@ public class RmidViaInheritedChannel implements Callback {
             return provider.openDatagramChannel();
         }
 
+        public DatagramChannel openDatagramChannel(ProtocolFamily family)
+            throws IOException
+        {
+            return provider.openDatagramChannel(family);
+        }
+
         public Pipe openPipe()
             throws IOException
         {
-- 
GitLab