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 2012/04/06 19:56:46 UTC
svn commit: r1310511 - in /cxf/branches/2.3.x-fixes: ./
api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
Author: dkulp
Date: Fri Apr 6 17:56:45 2012
New Revision: 1310511
URL: http://svn.apache.org/viewvc?rev=1310511&view=rev
Log:
Merged revisions 1310461 via svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........
r1310461 | dkulp | 2012-04-06 12:36:57 -0400 (Fri, 06 Apr 2012) | 17 lines
Merged revisions 1307674 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1307674 | dkulp | 2012-03-30 21:02:54 -0400 (Fri, 30 Mar 2012) | 9 lines
Merged revisions 1307653 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1307653 | dkulp | 2012-03-30 19:49:56 -0400 (Fri, 30 Mar 2012) | 2 lines
Fix a typo
........
........
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?rev=1310511&r1=1310510&r2=1310511&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java (original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java Fri Apr 6 17:56:45 2012
@@ -90,7 +90,7 @@ public final class SchemaInfo extends Ab
return element;
}
if (getSchema() == null) {
- throw new RuntimeException("No XmlSchma in SchemaInfo");
+ throw new RuntimeException("No XmlSchema in SchemaInfo");
}
XmlSchema sch = getSchema();