You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/03/31 22:03:14 UTC
incubator-juneau git commit: ObjectMap should handle empty strings.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 261557578 -> a0580074c
ObjectMap should handle empty strings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/a0580074
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/a0580074
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/a0580074
Branch: refs/heads/master
Commit: a0580074cbd5d54c78a0f55dc3ef976f5831b1a3
Parents: 2615575
Author: JamesBognar <ja...@apache.org>
Authored: Fri Mar 31 18:03:12 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Fri Mar 31 18:03:12 2017 -0400
----------------------------------------------------------------------
juneau-core/src/main/java/org/apache/juneau/ObjectMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/a0580074/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
index ff1d59e..c146b25 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
@@ -149,7 +149,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
this(p == null ? BeanContext.DEFAULT.createSession() : p.getBeanContext().createSession());
if (p == null)
p = JsonParser.DEFAULT;
- if (s != null)
+ if (! StringUtils.isEmpty(s))
p.parseIntoMap(s, this, session.string(), session.object());
}