You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/10/30 19:01:46 UTC
svn commit: r1537214 -
/cxf/branches/2.7.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java
Author: dkulp
Date: Wed Oct 30 18:01:46 2013
New Revision: 1537214
URL: http://svn.apache.org/r1537214
Log:
Merged revisions 1537212 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1537212 | dkulp | 2013-10-30 13:58:53 -0400 (Wed, 30 Oct 2013) | 2 lines
Remove this check, no longer needed.
........
Modified:
cxf/branches/2.7.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java
Modified: cxf/branches/2.7.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java?rev=1537214&r1=1537213&r2=1537214&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java (original)
+++ cxf/branches/2.7.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java Wed Oct 30 18:01:46 2013
@@ -92,10 +92,6 @@ public class W3CMultiSchemaFactory exten
}, new ExpressionPool());
}
- public final XMLSchemaGrammar getResultNoError() {
- return grammar;
- }
-
public void setLocator(Locator locator) {
if (locator == null && getLocator() != null && getLocator().getSystemId() != null) {
sysIds.add(getLocator().getSystemId());
@@ -127,9 +123,6 @@ public class W3CMultiSchemaFactory exten
XMLSchemaGrammar grammar = multiSchemaReader.getResult();
if (grammar == null) {
- grammar = xmlSchemaReader.getResultNoError();
- }
- if (grammar == null) {
throw new XMLStreamException("Failed to load schemas");
}
return new W3CSchema(grammar);