Bug 403865 - weaving plugin should have a null check in stop method for

cachingServiceFactory and cachingServiceFactoryRegistration to avoid NPE

3 files changed, 7 insertions, 5 deletions

diff --git a/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
index addd7cf8d..ba98f0e62 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.equinox.weaving.caching
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-Name: Standard Caching Service for Equinox Aspects (Incubation)
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Activator: org.eclipse.equinox.weaving.internal.caching.Activator
diff --git a/bundles/org.eclipse.equinox.weaving.caching/pom.xml b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
index 0c240b772..118c58101 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
@@ -22,7 +22,7 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.weaving.caching</artifactId>
-  <version>1.0.200-SNAPSHOT</version>
+  <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java b/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
index bec69665a..7e2ee9466 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
+++ b/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Heiko Seeberger and others.
+ * Copyright (c) 2008, 2013 Heiko Seeberger 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
@@ -64,8 +64,10 @@ public class Activator implements BundleActivator {
      * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
      */
     public void stop(final BundleContext context) {
-        cachingServiceFactory.stop();
-        cachingServiceFactoryRegistration.unregister();
+        if (cachingServiceFactoryRegistration != null) {
+            cachingServiceFactory.stop();
+            cachingServiceFactoryRegistration.unregister();
+        }
         if (Log.isDebugEnabled()) {
             Log.debug("Shut down and unregistered SingletonCachingService."); //$NON-NLS-1$
         }