You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2013/03/18 16:09:59 UTC
git commit: DELTASPIKE-321 If arguments are null do not add them.
Updated Branches:
refs/heads/master d860a471e -> 3faba9943
DELTASPIKE-321 If arguments are null do not add them.
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/3faba994
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/3faba994
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/3faba994
Branch: refs/heads/master
Commit: 3faba994349f0fbf7fafb7b99f0620f0063b8f0d
Parents: d860a47
Author: John D. Ament <jo...@gmail.com>
Authored: Mon Mar 18 10:56:39 2013 -0400
Committer: John D. Ament <jo...@gmail.com>
Committed: Mon Mar 18 10:56:39 2013 -0400
----------------------------------------------------------------------
.../core/impl/message/DefaultMessage.java | 5 ++++-
.../test/core/api/message/MessageContextTest.java | 13 +++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/3faba994/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
index 42e7819..713f308 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
@@ -60,7 +60,10 @@ public class DefaultMessage implements Message
@Override
public Message argument(Serializable... arguments)
{
- Collections.addAll(this.arguments, arguments);
+ if (arguments != null)
+ {
+ Collections.addAll(this.arguments, arguments);
+ }
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/3faba994/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
index e39d20d..cd084c3 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
@@ -104,6 +104,19 @@ public class MessageContextTest
Assert.assertEquals("test message to hans", messageText);
}
+
+ @Test
+ public void ignoreNullArguments()
+ {
+ LocaleResolver localeResolver = new FixedEnglishLocalResolver();
+
+ String messageText = messageContext
+ .localeResolver(localeResolver)
+ .messageResolver(new TestMessageResolver())
+ .message().template("{hello}").argument(null).toString();
+
+ Assert.assertEquals("test message to %s", messageText);
+ }
@Test
public void resolveGermanMessageTextTest()