Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 57AD0200C3A for ; Thu, 16 Mar 2017 14:06:52 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 56678160B7A; Thu, 16 Mar 2017 13:06:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5576B160B94 for ; Thu, 16 Mar 2017 14:06:51 +0100 (CET) Received: (qmail 54817 invoked by uid 500); 16 Mar 2017 13:06:50 -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 54335 invoked by uid 99); 16 Mar 2017 13:06:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Mar 2017 13:06:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D2DB3DFF46; Thu, 16 Mar 2017 13:06:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Thu, 16 Mar 2017 13:06:54 -0000 Message-Id: <562e514bd6da410bba81a79ceefe60c3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/12] cxf git commit: [CXF-7185] Correct hacks for CXF-3453 and CXF-1194 for french local archived-at: Thu, 16 Mar 2017 13:06:52 -0000 [CXF-7185] Correct hacks for CXF-3453 and CXF-1194 for french local [CXF-7185] Correct hacks for CXF-3453 and CXF-1194 in order to work with a local set in french This closes #219 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4d2ddd0b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4d2ddd0b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4d2ddd0b Branch: refs/heads/3.0.x-fixes Commit: 4d2ddd0b44451bcf9a70e975b77b52c279e37a7d Parents: 9768649 Author: Kévin Buntrock Authored: Wed Jan 4 16:10:14 2017 +0100 Committer: Daniel Kulp Committed: Wed Mar 15 14:52:18 2017 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java | 8 ++++---- .../src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4d2ddd0b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java index 374736f..fc01732 100644 --- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java +++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java @@ -78,10 +78,10 @@ public class DataReaderImpl extends JAXBDataBase implements DataReader { String msg = event.getMessage(); return msg != null && msg.contains(":Id") - && (msg.startsWith("cvc-type.3.1.1: ") - || msg.startsWith("cvc-type.3.2.2: ") - || msg.startsWith("cvc-complex-type.3.1.1: ") - || msg.startsWith("cvc-complex-type.3.2.2: ")); + && (msg.startsWith("cvc-type.3.1.1") + || msg.startsWith("cvc-type.3.2.2") + || msg.startsWith("cvc-complex-type.3.1.1") + || msg.startsWith("cvc-complex-type.3.2.2")); } } } http://git-wip-us.apache.org/repos/asf/cxf/blob/4d2ddd0b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java index 0c26166..77563a9 100644 --- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java +++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java @@ -99,7 +99,7 @@ public class DataWriterImpl extends JAXBDataBase implements DataWriter { public boolean handleEvent(ValidationEvent event) { // CXF-1194 this hack is specific to MTOM, so pretty safe to leave in here before calling the origHandler. String msg = event.getMessage(); - if (msg.startsWith("cvc-type.3.1.2: ") + if (msg.startsWith("cvc-type.3.1.2") && msg.contains(marshaller.getLastMTOMElementName().getLocalPart())) { return true; }