felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1620856 - in /felix/trunk/eventadmin/impl: changelog.txt src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
Date Wed, 27 Aug 2014 10:32:47 GMT
Author: cziegeler
Date: Wed Aug 27 10:32:46 2014
New Revision: 1620856

URL: http://svn.apache.org/r1620856
Log:
[FELIX-4617] - Empty configurations for ignore topic and ignore timeout lead to error messages
in the log

Modified:
    felix/trunk/eventadmin/impl/changelog.txt
    felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java

Modified: felix/trunk/eventadmin/impl/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/changelog.txt?rev=1620856&r1=1620855&r2=1620856&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/changelog.txt (original)
+++ felix/trunk/eventadmin/impl/changelog.txt Wed Aug 27 10:32:46 2014
@@ -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

Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java?rev=1620856&r1=1620855&r2=1620856&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
(original)
+++ felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
Wed Aug 27 10:32:46 2014
@@ -305,7 +305,7 @@ public class Configuration
             {
                 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 @@ public class Configuration
             {
                 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");



Mime
View raw message