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 2020/11/02 07:21:38 UTC
[felix-dev] branch master updated: FELIX-6354 :
IllegalStateException on shutdown
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 0245baa FELIX-6354 : IllegalStateException on shutdown
0245baa is described below
commit 0245baa922ca68718f5b75fc4cd0c23b519d7767
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Nov 2 08:21:12 2020 +0100
FELIX-6354 : IllegalStateException on shutdown
---
configadmin/changelog.txt | 8 ++++++++
.../main/java/org/apache/felix/cm/impl/ConfigurationManager.java | 9 ++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/configadmin/changelog.txt b/configadmin/changelog.txt
index 6bf9542..9ecf1d6 100644
--- a/configadmin/changelog.txt
+++ b/configadmin/changelog.txt
@@ -1,3 +1,11 @@
+Changes in 1.9.20
+-----------------
+** Bug
+ * [FELIX-6354] : IllegalStateException on shutdown
+ * [FELIX-6308] : Bad File Descriptor while persisting service configuration
+ * [FELIX-5690] : ConfigurationHandler should support ignoring whitespace between property key/equal sign & equal sign/property value
+
+
Changes in 1.9.18
-----------------
** Improvement
diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
index f6e3ba7..b27bd19 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
@@ -253,7 +253,14 @@ public class ConfigurationManager implements BundleListener
isActive = false;
// stop listening for events
- bundleContext.removeBundleListener( this );
+ try
+ {
+ bundleContext.removeBundleListener( this );
+ }
+ catch ( final IllegalStateException ise )
+ {
+ // might happen on shutdown - we can ignore this
+ }
if ( configurationListenerTracker != null )
{