You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/05/05 17:48:24 UTC
svn commit: r1677845 -
/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManager.java
Author: cschneider
Date: Tue May 5 15:48:24 2015
New Revision: 1677845
URL: http://svn.apache.org/r1677845
Log:
Avoid NPE when symbolicName is null
Modified:
aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManager.java
Modified: aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManager.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManager.java?rev=1677845&r1=1677844&r2=1677845&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManager.java (original)
+++ aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManager.java Tue May 5 15:48:24 2015
@@ -307,8 +307,9 @@ public class GlobalPersistenceManager im
// Assume only the ACTIVE state is being tracked.
return new BundleTrackerCustomizer() {
public Bundle addingBundle(Bundle bundle, BundleEvent event) {
+ String symName = bundle.getSymbolicName();
// Only track the region context bundles of subsystems.
- if (bundle.getSymbolicName().startsWith("org.osgi.service.subsystem.region.context."))
+ if (symName != null && symName.startsWith("org.osgi.service.subsystem.region.context."))
return bundle;
return null;
}