Author: tellison
Date: Thu Sep 3 13:48:12 2009
New Revision: 810938
URL: http://svn.apache.org/viewvc?rev=810938&view=rev
Log:
Apply slightly modified patch for HARMONY-6333 ([classlib][luni] DatagramSocketImplTest fails
to compile on RI due to method override differences)
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java?rev=810938&r1=810937&r2=810938&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java
Thu Sep 3 13:48:12 2009
@@ -104,17 +104,6 @@
}
/**
- * Gets the value for the specified socket option.
- *
- * @param optID
- * the ID of the socket option to be retrieved.
- * @return the requested option value.
- * @throws SocketException
- * if an error occurs while accessing the option.
- */
- public abstract Object getOption(int optID) throws SocketException;
-
- /**
* Gets the time-to-live (TTL) for multicast packets sent on this socket.
*
* @return the time-to-live option as a byte value.
@@ -232,19 +221,6 @@
protected abstract void send(DatagramPacket pack) throws IOException;
/**
- * Sets the value for the specified socket option.
- *
- * @param optID
- * the ID of the socket option to be set.
- * @param val
- * the value of the option.
- * @throws SocketException
- * if an error occurs while setting the option.
- */
- public abstract void setOption(int optID, Object val)
- throws SocketException;
-
- /**
* Sets the time-to-live (TTL) option for multicast packets sent on this
* socket.
*
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java?rev=810938&r1=810937&r2=810938&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
Thu Sep 3 13:48:12 2009
@@ -154,7 +154,6 @@
close();
}
- @Override
public Object getOption(int optID) throws SocketException {
if (optID == SocketOptions.SO_TIMEOUT) {
return Integer.valueOf(receiveTimeout);
@@ -285,7 +284,6 @@
* @throws SocketException thrown if the option value is unsupported or
* invalid
*/
- @Override
public void setOption(int optID, Object val) throws SocketException {
/*
* for datagram sockets on some platforms we have to set both the
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java?rev=810938&r1=810937&r2=810938&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java
Thu Sep 3 13:48:12 2009
@@ -71,7 +71,6 @@
// empty
}
- @Override
public Object getOption(int optID) throws SocketException {
return null;
}
@@ -129,7 +128,6 @@
}
- @Override
public void setOption(int optID, Object val) throws SocketException {
// empty
}
|