diff options
author | Thomas Watson | 2012-01-12 15:16:01 +0000 |
---|---|---|
committer | Thomas Watson | 2012-01-18 20:52:10 +0000 |
commit | 2e949b1a58c7d93f62fdebff512044d0fda3f8a9 (patch) | |
tree | 40ad736eca7b17a79638eea7ab06d6caa7161f8f | |
parent | 1adfd1b247f8446241bd426923dacb428c59d539 (diff) | |
download | rt.equinox.framework-2e949b1a58c7d93f62fdebff512044d0fda3f8a9.tar.gz rt.equinox.framework-2e949b1a58c7d93f62fdebff512044d0fda3f8a9.tar.xz rt.equinox.framework-2e949b1a58c7d93f62fdebff512044d0fda3f8a9.zip |
Bug 367689 - DuplicateBundleException is not serializable
3 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java index e526bcb26..1cf9e943f 100644 --- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java +++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2011 IBM Corporation and others. + * Copyright (c) 2003, 2012 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 @@ -1406,7 +1406,7 @@ public abstract class AbstractBundle implements Bundle, Comparable<Bundle>, Keye class BundleStatusException extends Throwable implements StatusException { private static final long serialVersionUID = 7201911791818929100L; private int code; - private Object status; + private transient Object status; BundleStatusException(String message, int code, Object status) { super(message); diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java index 050a1954a..d3aeaf645 100644 --- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java +++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2011 IBM Corporation and others. + * Copyright (c) 2003, 2012 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 @@ -728,7 +728,7 @@ public class Framework implements EventPublisher, Runnable { private class DuplicateBundleException extends BundleException implements StatusException { private static final long serialVersionUID = 135669822846323624L; - private final Bundle duplicate; + private transient Bundle duplicate; public DuplicateBundleException(String msg, Bundle duplicate) { super(msg, BundleException.DUPLICATE_BUNDLE_ERROR); diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java index 0c62e4d6d..e1c34d4df 100644 --- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java +++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2012 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 @@ -262,7 +262,7 @@ public class EclipseLazyStarter implements ClassLoadingStatsHook, AdaptorHook, H private static class TerminatingClassNotFoundException extends ClassNotFoundException implements StatusException { private static final long serialVersionUID = -6730732895632169173L; - private Object cause; + private Throwable cause; public TerminatingClassNotFoundException(String message, Throwable cause) { super(message, cause); |