FELIX-1028 : Prevent NPE on createFilter() call.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@762816 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
index ba5800b..278cf11 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
@@ -223,20 +223,23 @@
{
pidFilter = pid;
}
- try
+ if ( pidFilter != null )
{
- getBundleContext().createFilter( pidFilter );
-
- // if the pidFilter was set from the pid, clear the pid
- if ( pid == pidFilter )
+ try
{
- pid = null;
+ getBundleContext().createFilter( pidFilter );
+
+ // if the pidFilter was set from the pid, clear the pid
+ if ( pid == pidFilter )
+ {
+ pid = null;
+ }
}
- }
- catch ( InvalidSyntaxException ise )
- {
- // its ok, if the pid is just a single PID
- pidFilter = null;
+ catch ( InvalidSyntaxException ise )
+ {
+ // its ok, if the pid is just a single PID
+ pidFilter = null;
+ }
}
final ConfigurationAdmin ca = this.getConfigurationAdmin();