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 2016/08/03 13:07:38 UTC
incubator-juneau git commit: Fix unit test failures.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 95fc031f2 -> e5184ac90
Fix unit test failures.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/e5184ac9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/e5184ac9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/e5184ac9
Branch: refs/heads/master
Commit: e5184ac90e8e48ebce599e666e774295133604d1
Parents: 95fc031
Author: jamesbognar <ja...@gmail.com>
Authored: Wed Aug 3 09:07:35 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Wed Aug 3 09:07:35 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/juneau/html/HtmlSerializer.java | 2 +-
.../src/main/java/org/apache/juneau/internal/DelegateBeanMap.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e5184ac9/org.apache.juneau/src/main/java/org/apache/juneau/html/HtmlSerializer.java
----------------------------------------------------------------------
diff --git a/org.apache.juneau/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/org.apache.juneau/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 659e18e..6506b9c 100644
--- a/org.apache.juneau/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/org.apache.juneau/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -448,7 +448,7 @@ public class HtmlSerializer extends XmlSerializer {
else
m2 = bc.forBean(o);
- Iterator mapEntries = m2.entrySet(session.isTrimNulls()).iterator();
+ Iterator mapEntries = m2.entrySet(false).iterator();
while (mapEntries.hasNext()) {
BeanMapEntry p = (BeanMapEntry)mapEntries.next();
BeanPropertyMeta pMeta = p.getMeta();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e5184ac9/org.apache.juneau/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
----------------------------------------------------------------------
diff --git a/org.apache.juneau/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java b/org.apache.juneau/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
index 6110f2a..0c67ace 100644
--- a/org.apache.juneau/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
+++ b/org.apache.juneau/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
@@ -96,7 +96,7 @@ public class DelegateBeanMap<T> extends BeanMap<T> {
}
@Override /* Map */
- public Set<Entry<String,Object>> entrySet() {
+ public Set<Entry<String,Object>> entrySet(final boolean ignoreNulls) {
Set<Entry<String,Object>> s = Collections.newSetFromMap(new LinkedHashMap<Map.Entry<String,Object>,Boolean>());
for (final String key : keys) {
BeanMapEntry<T> bme;