cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [06/12] cxf git commit: [CXF-7185] Correct hacks for CXF-3453 and CXF-1194 for french local
Date Thu, 16 Mar 2017 13:06:54 GMT
[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 <kevin.buntrock@gmail.com>
Authored: Wed Jan 4 16:10:14 2017 +0100
Committer: Daniel Kulp <dkulp@apache.org>
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<T> extends JAXBDataBase implements DataReader<T>
{
                 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<T> extends JAXBDataBase implements DataWriter<T>
{
         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;
             }


Mime
View raw message