karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject karaf git commit: [KARAF-3765] Eventadmin logs warnings about wrong values
Date Thu, 11 Jun 2015 06:56:07 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 8723b8fd8 -> a93becede


[KARAF-3765] Eventadmin logs warnings about wrong values

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a93beced
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a93beced
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a93beced

Branch: refs/heads/master
Commit: a93becede6b370f87ef57ab09a590c4d833de74e
Parents: 8723b8f
Author: Guillaume Nodet <gnodet@gmail.com>
Authored: Thu Jun 11 08:52:04 2015 +0200
Committer: Guillaume Nodet <gnodet@gmail.com>
Committed: Thu Jun 11 08:52:04 2015 +0200

----------------------------------------------------------------------
 .../java/org/apache/felix/eventadmin/impl/Configuration.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/a93beced/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
----------------------------------------------------------------------
diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
index e4fb760..02ab0aa 100644
--- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
+++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
@@ -306,7 +306,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");
@@ -321,7 +321,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