cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [2/3] cxf git commit: [CXF-7185] Correct hacks for CXF-3453 and CXF-1194 for french local
Date Thu, 26 Jan 2017 19:22:31 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/d21f847e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d21f847e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d21f847e

Branch: refs/heads/3.1.x-fixes
Commit: d21f847e9ddd8996eee5f6e5978be6aa037a4c4e
Parents: e33823c
Author: Kévin Buntrock <kevin.buntrock@gmail.com>
Authored: Wed Jan 4 16:10:14 2017 +0100
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Jan 26 14:21:30 2017 -0500

----------------------------------------------------------------------
 .../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/d21f847e/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/d21f847e/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 2ec2558..53a99ea 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
@@ -100,7 +100,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