Repository: incubator-juneau Updated Branches: refs/heads/master bf06f82a1 -> 24d06b7fc
PojoQuery can cause XmlSerializer to throw a NullPointerException. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/24d06b7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/24d06b7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/24d06b7f Branch: refs/heads/master Commit: 24d06b7fc23b1eb1237da6ea93ba6edf0be2a00e Parents: bf06f82 Author: jamesbognar <[email protected]> Authored: Fri Aug 5 15:57:00 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Fri Aug 5 15:57:00 2016 -0400 ---------------------------------------------------------------------- .../org/apache/juneau/internal/DelegateBeanMap.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/24d06b7f/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 4adf0cd..df96408 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 @@ -15,6 +15,9 @@ package org.apache.juneau.internal; import java.util.*; import org.apache.juneau.*; +import org.apache.juneau.html.*; +import org.apache.juneau.jena.*; +import org.apache.juneau.xml.*; /** * Represents a wrapped {@link BeanMap} where property values can be overridden, removed, or reordered @@ -117,11 +120,24 @@ public class DelegateBeanMap<T> extends BeanMap<T> { for (final String key : keys) { BeanPropertyMeta<T> p = this.getPropertyMeta(key); if (overrideValues.containsKey(key)) { + final BeanPropertyMeta<T> p2 = p; p = new BeanPropertyMeta<T>(this.meta, key) { @Override /* BeanPropertyMeta */ public Object get(BeanMap<T> m) { return overrideValues.get(key); } + @Override /* BeanPropertyMeta */ + public RdfBeanPropertyMeta<T> getRdfMeta() { + return p2.getRdfMeta(); + } + @Override /* BeanPropertyMeta */ + public HtmlBeanPropertyMeta<T> getHtmlMeta() { + return p2.getHtmlMeta(); + } + @Override /* BeanPropertyMeta */ + public XmlBeanPropertyMeta<T> getXmlMeta() { + return p2.getXmlMeta(); + } }; } if (p == null)
