Added a suppress warning instead of closing the stream.I20130903-2000

TL;DR
Reflection messes with the the compiler's resource leak detection.

Because much of the equinox test code happens reflectively, we can't
actually close the stream (as the compiler wants us to). This keeps the
stream open so the shutdown method can be invoked. 

1 files changed, 3 insertions, 10 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/embeddedequinox/EmbeddedEquinox.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/embeddedequinox/EmbeddedEquinox.java
index 3eea18a57..9b590f96a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/embeddedequinox/EmbeddedEquinox.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/embeddedequinox/EmbeddedEquinox.java
@@ -37,9 +37,10 @@ public class EmbeddedEquinox {
 
 	public BundleContext startFramework() {
 		System.setProperty("osgi.framework.useSystemProperties", "false");
-		URLClassLoader frameworkLoader = null;
 		try {
-			frameworkLoader = new FrameworkClassLoader(frameworkClassPath, this.getClass().getClassLoader());
+			@SuppressWarnings("resource")
+			// For some reason when you close the framework loader, tests fail!
+			URLClassLoader frameworkLoader = new FrameworkClassLoader(frameworkClassPath, this.getClass().getClassLoader());
 			eclipseStarterClazz = frameworkLoader.loadClass("org.eclipse.core.runtime.adaptor.EclipseStarter");
 
 			Method setInitialProperties = eclipseStarterClazz.getMethod("setInitialProperties", new Class[] {Map.class}); //$NON-NLS-1$
@@ -51,14 +52,6 @@ public class EmbeddedEquinox {
 			if (t instanceof RuntimeException)
 				throw (RuntimeException) t;
 			throw new RuntimeException(t);
-		} finally {
-			if (frameworkLoader != null) {
-				try {
-					frameworkLoader.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
 		}
 		return context;
 	}