diff options
author | Thomas Watson | 2016-10-25 16:29:10 +0000 |
---|---|---|
committer | Thomas Watson | 2016-10-25 16:48:21 +0000 |
commit | 6f0aa116164ab33a68febb38ac60abd8e8e77b7d (patch) | |
tree | 3b96cfc8ff310197abfbc7d8e1bf3e46572aae21 | |
parent | 8f1121b25d14ad9c88b63f21f43e9afdb95acfbc (diff) | |
download | rt.equinox.framework-6f0aa116164ab33a68febb38ac60abd8e8e77b7d.tar.gz rt.equinox.framework-6f0aa116164ab33a68febb38ac60abd8e8e77b7d.tar.xz rt.equinox.framework-6f0aa116164ab33a68febb38ac60abd8e8e77b7d.zip |
Bug 506460 - openConnection(URL u, Proxy p) is unsupported when multipleI20161025-2000
frameworks are running
Change-Id: I44b31638002212d08a0a47bd4d9511d88420cc3b
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
4 files changed, 39 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/geturl/geturl/Activator.java b/bundles/org.eclipse.osgi.tests/bundles_src/geturl/geturl/Activator.java index 665c8e65e..1a17503c7 100644 --- a/bundles/org.eclipse.osgi.tests/bundles_src/geturl/geturl/Activator.java +++ b/bundles/org.eclipse.osgi.tests/bundles_src/geturl/geturl/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 IBM Corporation and others. + * Copyright (c) 2010, 2016 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 @@ -10,8 +10,8 @@ *******************************************************************************/ package geturl; -import java.net.MalformedURLException; -import java.net.URL; +import java.io.IOException; +import java.net.*; import java.security.PrivilegedAction; import java.util.Dictionary; import java.util.Hashtable; @@ -40,8 +40,13 @@ public class Activator implements BundleActivator { throw new RuntimeException("Could not create URL from parts: " + url); } url.toExternalForm(); - return Boolean.TRUE; + try { + url.openConnection(Proxy.NO_PROXY); + } catch (IOException e) { + // expected since our impl throws this + } + return Boolean.TRUE; } }, props); } diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java index eaf9aa5e9..7ff00b52f 100755 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java @@ -1247,6 +1247,11 @@ public class SystemBundleTests extends AbstractBundleTests { throw new IOException(); } + @Override + public URLConnection openConnection(URL u, Proxy p) throws IOException { + throw new IOException(); + } + } public void testURLMultiplexing01() throws BundleException { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java index 025e6a485..c82ab15ed 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingURLStreamHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 Cognos Incorporated, IBM Corporation and others. + * Copyright (c) 2006, 2016 Cognos Incorporated, 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 @@ -11,10 +11,12 @@ package org.eclipse.osgi.internal.url; import java.io.IOException; import java.lang.reflect.*; import java.net.*; +import java.net.Proxy; import org.eclipse.osgi.framework.log.FrameworkLogEntry; public class MultiplexingURLStreamHandler extends URLStreamHandler { private static Method openConnectionMethod; + private static Method openConnectionProxyMethod; private static Method equalsMethod; private static Method getDefaultPortMethod; private static Method getHostAddressMethod; @@ -38,6 +40,9 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler { openConnectionMethod = URLStreamHandler.class.getDeclaredMethod("openConnection", new Class[] {URL.class}); //$NON-NLS-1$ openConnectionMethod.setAccessible(true); + openConnectionProxyMethod = URLStreamHandler.class.getDeclaredMethod("openConnection", new Class[] {URL.class, Proxy.class}); //$NON-NLS-1$ + openConnectionProxyMethod.setAccessible(true); + equalsMethod = URLStreamHandler.class.getDeclaredMethod("equals", new Class[] {URL.class, URL.class}); //$NON-NLS-1$ equalsMethod.setAccessible(true); @@ -104,6 +109,24 @@ public class MultiplexingURLStreamHandler extends URLStreamHandler { throw new MalformedURLException(); } + @Override + protected URLConnection openConnection(URL url, Proxy proxy) throws IOException { + URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol); + if (handler != null) { + try { + return (URLConnection) openConnectionProxyMethod.invoke(handler, new Object[] {url, proxy}); + } catch (InvocationTargetException e) { + if (e.getTargetException() instanceof IOException) + throw (IOException) e.getTargetException(); + throw (RuntimeException) e.getTargetException(); + } catch (Exception e) { + factory.container.getLogServices().log(MultiplexingURLStreamHandler.class.getName(), FrameworkLogEntry.ERROR, "openConnection", e); //$NON-NLS-1$ + throw new RuntimeException(e.getMessage(), e); + } + } + throw new MalformedURLException(); + } + protected boolean equals(URL url1, URL url2) { URLStreamHandler handler = findAuthorizedURLStreamHandler(protocol); if (handler != null) { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java index 85c904771..563da3d1e 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java @@ -224,6 +224,7 @@ public class URLStreamHandlerProxy extends URLStreamHandler implements ServiceTr protected URLConnection openConnection(URL u, Proxy p) throws IOException { try { Method openConn = realHandlerService.getClass().getMethod("openConnection", new Class[] {URL.class, Proxy.class}); //$NON-NLS-1$ + openConn.setAccessible(true); return (URLConnection) openConn.invoke(realHandlerService, new Object[] {u, p}); } catch (InvocationTargetException e) { if (e.getTargetException() instanceof IOException) |