Repository: incubator-juneau Updated Branches: refs/heads/master 6dccf6039 -> 26e67a40f
JUNEAU-53 Testcases fail on non US Locale Zone. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/26e67a40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/26e67a40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/26e67a40 Branch: refs/heads/master Commit: 26e67a40f1a91dbb30e96270b9d90377c3836d15 Parents: 6dccf60 Author: JamesBognar <[email protected]> Authored: Sat Jun 10 17:21:02 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Sat Jun 10 17:21:02 2017 -0400 ---------------------------------------------------------------------- juneau-core/src/main/java/org/apache/juneau/BeanContext.java | 2 +- juneau-core/src/main/java/org/apache/juneau/BeanSession.java | 6 ++++-- .../src/main/java/org/apache/juneau/xml/XmlSerializer.java | 2 +- juneau-core/src/main/java/org/apache/juneau/xml/XmlWriter.java | 5 ++++- 4 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26e67a40/juneau-core/src/main/java/org/apache/juneau/BeanContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java index b4d07f9..53a8cc0 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java @@ -904,7 +904,7 @@ public class BeanContext extends Context { implKeyClasses = implClasses.keySet().toArray(new Class[0]); implValueClasses = implClasses.values().toArray(new Class[0]); - locale = pm.get(BEAN_locale, Locale.class, Locale.getDefault()); + locale = pm.get(BEAN_locale, Locale.class, null); timeZone = pm.get(BEAN_timeZone, TimeZone.class, null); mediaType = pm.get(BEAN_mediaType, MediaType.class, null); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26e67a40/juneau-core/src/main/java/org/apache/juneau/BeanSession.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/src/main/java/org/apache/juneau/BeanSession.java index 81557dc..a40881e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanSession.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanSession.java @@ -58,17 +58,19 @@ public class BeanSession extends Session { protected BeanSession(BeanContext ctx, ObjectMap op, Locale locale, TimeZone timeZone, MediaType mediaType) { super(ctx, op); this.ctx = ctx; + Locale _locale = null; if (op == null || op.isEmpty()) { - this.locale = (locale != null ? locale : ctx.locale); + _locale = (locale != null ? locale : ctx.locale); this.timeZone = (timeZone != null ? timeZone : ctx.timeZone); this.debug = ctx.debug; this.mediaType = mediaType != null ? mediaType : ctx.mediaType; } else { - this.locale = (locale == null ? op.get(Locale.class, BEAN_locale, ctx.locale) : locale); + _locale = (locale == null ? op.get(Locale.class, BEAN_locale, ctx.locale) : locale); this.timeZone = (timeZone == null ? op.get(TimeZone.class, BEAN_timeZone, ctx.timeZone) : timeZone); this.debug = op.getBoolean(BEAN_debug, false); this.mediaType = (mediaType == null ? op.get(MediaType.class, BEAN_mediaType, ctx.mediaType) : mediaType); } + this.locale = _locale == null ? Locale.getDefault() : _locale; } /** http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26e67a40/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java index 4bee6b4..84c86aa 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java @@ -644,7 +644,7 @@ public class XmlSerializer extends WriterSerializer { Namespace ns = (session.isEnableNamespaces() && pMeta.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace() != elementNs ? pMeta.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace() : null); - if (pMeta.isUri()) { + if (pMeta.isUri() ) { out.attrUri(ns, key, value); } else if (n.equals(attrsProperty)) { if (value instanceof BeanMap) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26e67a40/juneau-core/src/main/java/org/apache/juneau/xml/XmlWriter.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlWriter.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlWriter.java index d1ed78e..3166b98 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlWriter.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlWriter.java @@ -13,6 +13,7 @@ package org.apache.juneau.xml; import java.io.*; +import java.net.*; import org.apache.juneau.*; import org.apache.juneau.serializer.*; @@ -555,8 +556,10 @@ public class XmlWriter extends SerializerWriter { private XmlWriter attrValue(Object o, boolean needsEncoding) throws IOException { if (needsEncoding) XmlUtils.encodeAttrValue(out, o, this.trimStrings); + else if (o instanceof URI || o instanceof URL) + append(uriResolver.resolve(o)); else - append(o.toString()); + append(o); return this; }
