Author: ningjiang
Date: Tue Oct 18 03:29:40 2011
New Revision: 1185464
URL: http://svn.apache.org/viewvc?rev=1185464&view=rev
Log:
Merged revisions 1185460 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1185460 | ningjiang | 2011-10-18 10:36:01 +0800 (Tue, 18 Oct 2011) | 1 line
CXF-3858 Fixed the typo with thanks to Glen
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 18 03:29:40 2011
@@ -1 +1 @@
-/cxf/trunk:1183107,1183212,1183253
+/cxf/trunk:1183107,1183212,1183253,1185460
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties?rev=1185464&r1=1185463&r2=1185464&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties
(original)
+++
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties
Tue Oct 18 03:29:40 2011
@@ -20,5 +20,5 @@
#
COULD_NOT_READ_XML_STREAM = Could not parse the XML stream.
COULD_NOT_WRITE_XML_STREAM = Could not generate the XML stream.
-COULD_NOT_REDA_XML_STREAM_CAUSED_BY = Could not parse the XML stream caused
by: {0}: {1}.
+COULD_NOT_READ_XML_STREAM_CAUSED_BY = Could not parse the XML stream caused
by: {0}: {1}.
COULD_NOT_WRITE_XML_STREAM_CAUSED_BY = Could not generate the XML stream
caused by: {0}: {1}.
Modified:
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java?rev=1185464&r1=1185463&r2=1185464&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
Tue Oct 18 03:29:40 2011
@@ -66,7 +66,7 @@ public class NodeDataReader implements D
} catch (IOException e) {
throw new Fault("COULD_NOT_READ_XML_STREAM", LOG, e);
} catch (TransformerException e) {
- throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
+ throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e,
e.getClass().getCanonicalName(),
e.getMessage());
}
}
Modified:
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1185464&r1=1185463&r2=1185464&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Tue Oct 18 03:29:40 2011
@@ -139,10 +139,10 @@ public class XMLStreamDataReader impleme
} catch (IOException e) {
throw new Fault("COULD_NOT_READ_XML_STREAM", LOG, e);
} catch (XMLStreamException e) {
- throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
+ throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e,
e.getClass().getCanonicalName(), e.getMessage());
} catch (SAXException e) {
- throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
+ throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e,
e.getClass().getCanonicalName(), e.getMessage());
}
}
@@ -227,7 +227,7 @@ public class XMLStreamDataReader impleme
return new DOMSource(document);
}
} catch (XMLStreamException e) {
- throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
+ throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e,
e.getClass().getCanonicalName(), e.getMessage());
}
}
