Bug 358676 ( Part 2 of fix ) - [Test] Remove unnecessary reflection code

in org.eclipse.ua.tests

2 files changed, 8 insertions, 28 deletions

diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerBinding.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerBinding.java
index 329c36f5f..a859cf1b8 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerBinding.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
 package org.eclipse.ua.tests.help.webapp;
 
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.URLConnection;
@@ -100,18 +99,9 @@ public class HelpServerBinding extends TestCase {
 		}
 	}
 	
-	private void setTimeout(URLConnection conn, int milliseconds) {
-		Class conClass = conn.getClass();
-		try {
-			Method timeoutMethod = conClass.getMethod(
-					"setConnectTimeout", new Class[]{ int.class } ); //$NON-NLS-1$
-			timeoutMethod.invoke(conn, new Object[] { new Integer(milliseconds)} );
-			Method readMethod = conClass.getMethod(
-					"setReadTimeout", new Class[]{ int.class } ); //$NON-NLS-1$
-			readMethod.invoke(conn, new Object[] { new Integer(milliseconds)} );
-		} catch (Exception e) {
-		     // If running on a 1.4 JRE an exception is expected, fall through
-		} 
+	private static void setTimeout(URLConnection conn, int milliseconds) {
+		conn.setConnectTimeout(milliseconds);
+		conn.setReadTimeout(milliseconds);
 	}
 		
 }
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java
index 3a20c7cc7..e0e3387b7 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
 package org.eclipse.ua.tests.help.webapp;
 
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLConnection;
 
@@ -121,18 +120,9 @@ public class HelpServerInterrupt extends TestCase {
 		}
 	}
 	
-	private void setTimeout(URLConnection conn, int milliseconds) {
-		Class conClass = conn.getClass();
-		try {
-			Method timeoutMethod = conClass.getMethod(
-					"setConnectTimeout", new Class[]{ int.class } ); //$NON-NLS-1$
-			timeoutMethod.invoke(conn, new Object[] { new Integer(milliseconds)} );
-			Method readMethod = conClass.getMethod(
-					"setReadTimeout", new Class[]{ int.class } ); //$NON-NLS-1$
-			readMethod.invoke(conn, new Object[] { new Integer(milliseconds)} );
-		} catch (Exception e) {
-		     // If running on a 1.4 JRE an exception is expected, fall through
-		} 
+	private static void setTimeout(URLConnection conn, int milliseconds) {
+		conn.setConnectTimeout(milliseconds);
+		conn.setReadTimeout(milliseconds);
 	}
 		
 }