Repository: karaf-decanter Updated Branches: refs/heads/master 0b32e3800 -> 1fbec8159
[KARAF-4634] Do not set property if value is null Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/1fbec815 Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/1fbec815 Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/1fbec815 Branch: refs/heads/master Commit: 1fbec8159e6ed97726cd1c4e48d11038fbbd17d5 Parents: 0b32e38 Author: Christian Schneider <[email protected]> Authored: Fri Jul 22 15:52:38 2016 +0200 Committer: Christian Schneider <[email protected]> Committed: Fri Jul 22 15:52:38 2016 +0200 ---------------------------------------------------------------------- appender/jms/pom.xml | 5 +++++ .../org/apache/karaf/decanter/appender/jms/JmsAppender.java | 5 ++++- .../org/apache/karaf/decanter/appender/jms/JmsAppenderTest.java | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/1fbec815/appender/jms/pom.xml ---------------------------------------------------------------------- diff --git a/appender/jms/pom.xml b/appender/jms/pom.xml index c14865d..3ca0743 100644 --- a/appender/jms/pom.xml +++ b/appender/jms/pom.xml @@ -44,6 +44,11 @@ <artifactId>activemq-broker</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>1.7.21</version> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/1fbec815/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java ---------------------------------------------------------------------- diff --git a/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java b/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java index 0dd2665..021c491 100644 --- a/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java +++ b/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java @@ -90,7 +90,10 @@ public class JmsAppender implements EventHandler { } } - void setProperty(MapMessage message, String name, Object value) throws JMSException { + private void setProperty(MapMessage message, String name, Object value) throws JMSException { + if (value == null) { + return; + } if (value instanceof String) message.setString(name, (String) value); else if (value instanceof Boolean) http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/1fbec815/appender/jms/src/test/java/org/apache/karaf/decanter/appender/jms/JmsAppenderTest.java ---------------------------------------------------------------------- diff --git a/appender/jms/src/test/java/org/apache/karaf/decanter/appender/jms/JmsAppenderTest.java b/appender/jms/src/test/java/org/apache/karaf/decanter/appender/jms/JmsAppenderTest.java index 2df8f51..dfb3a64 100644 --- a/appender/jms/src/test/java/org/apache/karaf/decanter/appender/jms/JmsAppenderTest.java +++ b/appender/jms/src/test/java/org/apache/karaf/decanter/appender/jms/JmsAppenderTest.java @@ -55,9 +55,10 @@ public class JmsAppenderTest { props.put("string", "test"); props.put("boolean", true); props.put("integer", 1); + props.put("testnull", null); appender.handleEvent(new Event("decanter/collect", props)); - MapMessage message = (MapMessage)consumer.receive(); + MapMessage message = (MapMessage)consumer.receive(1000); consumer.close(); sess.close(); con.close();
