Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2015-11-24 02:25:43 +0000
committerslewis2015-11-24 02:25:43 +0000
commitb4e0dc97bbec3add3378ae36c8d3b82355cfad4e (patch)
treefd09867f40b235be0dee23a25af1a7914794193a /framework
parent767a509a09ab3c446dc08e95448e3014310510a6 (diff)
downloadorg.eclipse.ecf-b4e0dc97bbec3add3378ae36c8d3b82355cfad4e.tar.gz
org.eclipse.ecf-b4e0dc97bbec3add3378ae36c8d3b82355cfad4e.tar.xz
org.eclipse.ecf-b4e0dc97bbec3add3378ae36c8d3b82355cfad4e.zip
Fix for build compile error (use of Java 8 IOException constructor).
Diffstat (limited to 'framework')
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java
index ae72f94e4..1a3cd27b0 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java
@@ -32,18 +32,20 @@ public class ClassResolverObjectInputStream extends ObjectInputStream {
primClasses.put("void", void.class); //$NON-NLS-1$
}
- public static ObjectInputStream create(BundleContext ctxt, InputStream ins) throws IOException {
+ public static ObjectInputStream create(BundleContext ctxt, InputStream ins, String filter) throws IOException, SecurityException {
if (ctxt == null)
return new ObjectInputStream(ins);
try {
- return new ClassResolverObjectInputStream(ctxt, ins, "(" + IClassResolver.BUNDLE_PROP_NAME + "=" + ctxt.getBundle().getSymbolicName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- } catch (SecurityException e) {
- throw new IOException("Could not create ClassResolverObjectInputStream", e); //$NON-NLS-1$
+ return new ClassResolverObjectInputStream(ctxt, ins, filter);
} catch (InvalidSyntaxException e) {
- throw new IOException("Could not create ClassResolverObjectInputStream", e); //$NON-NLS-1$
+ throw new IOException("Could not create ClassResolverObjectInputStream because of InvalidSyntaxException in filter=" + filter); //$NON-NLS-1$
}
}
+ public static ObjectInputStream create(BundleContext ctxt, InputStream ins) throws IOException {
+ return create(ctxt, ins, null);
+ }
+
private final BundleContext bundleContext;
private ServiceTracker<IClassResolver, IClassResolver> classResolverST;
private final Object trackerLock = new Object();

Back to the top