[FELIX-4617] - Empty configurations for ignore topic and ignore timeout lead to error messages in the log
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1620856 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/eventadmin/impl/changelog.txt b/eventadmin/impl/changelog.txt
index 3a30916..fe49877 100644
--- a/eventadmin/impl/changelog.txt
+++ b/eventadmin/impl/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 1.4.0 to 1.4.2
+---------------------------
+** Bug
+ * [FELIX-4617] - Empty configurations for ignore topic and ignore timeout lead to error messages in the log
+
+
Changes from 1.3.2 to 1.4.0
---------------------------
** Improvement
diff --git a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
index 690ca3e..e0e3eca 100644
--- a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
+++ b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
@@ -305,7 +305,7 @@
{
m_ignoreTimeout = (String[])value;
}
- else
+ else if ( value != null )
{
LogWrapper.getLogger().log(LogWrapper.LOG_WARNING,
"Value for property: " + PROP_IGNORE_TIMEOUT + " is neither a string nor a string array - Using default");
@@ -320,7 +320,7 @@
{
m_ignoreTopics = (String[])valueIT;
}
- else
+ else if ( valueIT != null )
{
LogWrapper.getLogger().log(LogWrapper.LOG_WARNING,
"Value for property: " + PROP_IGNORE_TOPIC + " is neither a string nor a string array - Using default");