commit 3b53b4eff24e99218af74092bc9f87c02814a2d1
author David Jencks <djencks@apache.org> Thu Dec 10 17:19:32 2015 +0000
committer David Jencks <djencks@apache.org> Thu Dec 10 17:19:32 2015 +0000
tree 8b1d2a4ec4d50861f8b1ecc04b3c10e637d1e73c
parent c8fe44159f348797f62fcff74384e0cf3e0aee13

FELIX-5079 fix NPE introduced in 1717854

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1719115 13f79535-47bb-0310-9956-ffa450edef68

scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java b/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
index 2a6aeb3..7ec8bad 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
@@ -556,8 +556,11 @@
                 }
 
             }
-            configAdminTracker.dispose();
-
+            if (configAdminTracker != null)
+            {
+            	configAdminTracker.dispose();
+            }
+            
             log(LogService.LOG_DEBUG, "BundleComponentActivator : Bundle [{0}] STOPPED",
                 new Object[] { m_bundle.getBundleId() }, null, null, null);