Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-11-07 20:09:35 +0000
committerThomas Watson2012-11-07 20:09:35 +0000
commita206df89cf33e151bd69de5c769b8f7c4a54426f (patch)
treeabe4d11ffff5b8873c06bf3abbb4fd14f9b2ee63
parentef83f6a9c89a0a5e6852d6baddf94b21337507a1 (diff)
downloadrt.equinox.framework-a206df89cf33e151bd69de5c769b8f7c4a54426f.tar.gz
rt.equinox.framework-a206df89cf33e151bd69de5c769b8f7c4a54426f.tar.xz
rt.equinox.framework-a206df89cf33e151bd69de5c769b8f7c4a54426f.zip
Bug 393787 - MultiplexingURLStreamHandler throw IllegalStateException
when nothing on stack is from a bundle class loader
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java
index 648292324..990714631 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2010 Cognos Incorporated, IBM Corporation and others.
+ * Copyright (c) 2006, 2012 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
@@ -135,7 +135,10 @@ public abstract class MultiplexingFactory {
}
}
}
- return null;
+ // Instead of returning null here, this factory is returned;
+ // This means the root factory may provide protocol handlers for call stacks
+ // that have no classes loaded by an bundle class loader.
+ return this;
}
public boolean hasAuthority(Class<?> clazz) {

Back to the top