Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6102D1168F for ; Fri, 21 Feb 2014 16:59:36 +0000 (UTC) Received: (qmail 90532 invoked by uid 500); 21 Feb 2014 16:59:34 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 90423 invoked by uid 500); 21 Feb 2014 16:59:34 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 90416 invoked by uid 99); 21 Feb 2014 16:59:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Feb 2014 16:59:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C0E9D82E748; Fri, 21 Feb 2014 16:59:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <13097767b57d42f99dc110c820c033eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Minor update to JAXB provider for it to prevent handling Document objects in cases where no type info is available Date: Fri, 21 Feb 2014 16:59:33 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master c886ce37f -> f52704565 Minor update to JAXB provider for it to prevent handling Document objects in cases where no type info is available Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f5270456 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f5270456 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f5270456 Branch: refs/heads/master Commit: f527045653f3c8a5877eb66efe4cfdd789a732b8 Parents: c886ce3 Author: Sergey Beryozkin Authored: Fri Feb 21 16:59:16 2014 +0000 Committer: Sergey Beryozkin Committed: Fri Feb 21 16:59:16 2014 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/provider/JAXBElementProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f5270456/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java index 215bc8a..77a73e1 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java @@ -56,6 +56,8 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Source; +import org.w3c.dom.Document; + import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.jaxrs.ext.MessageContext; import org.apache.cxf.jaxrs.ext.Nullable; @@ -101,6 +103,10 @@ public class JAXBElementProvider extends AbstractJAXBProvider { } + protected boolean objectFactoryOrIndexAvailable(Class type) { + return !Document.class.isAssignableFrom(type) && super.objectFactoryOrIndexAvailable(type); + } + public void setXmlResourceOffset(String value) { xmlResourceOffset = value; }