You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2009/04/07 17:23:47 UTC
svn commit: r762816 -
/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
Author: cziegeler
Date: Tue Apr 7 15:23:47 2009
New Revision: 762816
URL: http://svn.apache.org/viewvc?rev=762816&view=rev
Log:
FELIX-1028 : Prevent NPE on createFilter() call.
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java?rev=762816&r1=762815&r2=762816&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java Tue Apr 7 15:23:47 2009
@@ -223,21 +223,24 @@
{
pidFilter = pid;
}
- try
+ if ( pidFilter != null )
{
- getBundleContext().createFilter( pidFilter );
+ try
+ {
+ getBundleContext().createFilter( pidFilter );
- // if the pidFilter was set from the pid, clear the pid
- if ( pid == pidFilter )
+ // if the pidFilter was set from the pid, clear the pid
+ if ( pid == pidFilter )
+ {
+ pid = null;
+ }
+ }
+ catch ( InvalidSyntaxException ise )
{
- pid = null;
+ // 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();