Author: rwinston
Date: Fri Aug 25 14:27:28 2006
New Revision: 436960
URL: http://svn.apache.org/viewvc?rev=436960&view=rev
Log:
Explicitly use isConnected() without reflection
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java?rev=436960&r1=436959&r2=436960&view=diff
==============================================================================
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
Fri Aug 25 14:27:28 2006
@@ -19,8 +19,6 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.Socket;
import java.net.SocketException;
@@ -482,11 +480,10 @@
}
/**
- * Checks if the socket is connected using reflection to be backward
compatible.
- * The return value of this method is only meaningful in an java 1.4
environment.
+ * Checks if the socket is connected
*
* @param socket
- * @return true if connected or pre java 1.4
+ * @return true if connected
*/
private boolean socketIsConnected(Socket socket)
{
@@ -495,23 +492,8 @@
return false;
}
- try
- {
- Method isConnected = socket.getClass().getMethod("isConnected",
null);
- return ((Boolean) isConnected.invoke(socket, null)).booleanValue();
- }
- catch (NoSuchMethodException e)
- {
- return true;
- }
- catch (IllegalAccessException e)
- {
- return true;
- }
- catch (InvocationTargetException e)
- {
- return true;
- }
+ return socket.isConnected();
+
}
/***
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
