cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Tue, 29 Nov 2016 12:44:55 GMT
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/623860d4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/623860d4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/623860d4

Branch: refs/heads/3.1.x-fixes
Commit: 623860d496086f2376c8b821f8749f92799a1fe9
Parents: 55adad1
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Nov 29 12:44:46 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Nov 29 12:44:46 2016 +0000

----------------------------------------------------------------------
 .../factory/XercesSchemaValidationUtils.java      | 18 ------------------
 1 file changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/623860d4/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
index 3771914..24a9293 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
@@ -49,7 +49,6 @@ import org.apache.xerces.xs.XSLoader;
  */
 class XercesSchemaValidationUtils {
 
-<<<<<<< HEAD
     @SuppressWarnings("rawtypes")
     private static final class ListLSInput extends ArrayList implements LSInputList {
         private static final long serialVersionUID = 1L;
@@ -68,11 +67,7 @@ class XercesSchemaValidationUtils {
         }
     }
     
-    class DOMLSInput implements LSInput {
-=======
-   
     static class DOMLSInput implements LSInput {
->>>>>>> 01fdc40... More FindBugs work
         private String systemId;
         private String data;
         
@@ -162,19 +157,6 @@ class XercesSchemaValidationUtils {
         impl = (XSImplementation)source.getDOMImplementation("XS-Loader");
     }
 
-<<<<<<< HEAD
-=======
-    
-    Method findMethod(Object o, String name) {
-        for (Method m : o.getClass().getMethods()) {
-            if (m.getName() != null && m.getName().equals(name)) {
-                m.setAccessible(true);
-                return m;
-            }
-        }
-        return null;
-    }
->>>>>>> 01fdc40... More FindBugs work
     void tryToParseSchemas(XmlSchemaCollection collection, DOMErrorHandler handler)
         throws XmlSchemaSerializerException, TransformerException {
 


Mime
View raw message