You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cxf.apache.org by Glen Mazza <gm...@talend.com> on 2011/10/17 18:57:39 UTC
Re: svn commit: r1182802 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/databinding/source/
On 10/13/2011 08:30 AM, ningjiang@apache.org wrote:
> Author: ningjiang
> Date: Thu Oct 13 12:30:45 2011
> New Revision: 1182802
>
> URL: http://svn.apache.org/viewvc?rev=1182802&view=rev
> Log:
> Merged revisions 1182754 via svnmerge from
> https://svn.apache.org/repos/asf/cxf/trunk
>
> ........
> r1182754 | ningjiang | 2011-10-13 18:08:19 +0800 (Thu, 13 Oct 2011) | 1 line
>
> CXF-3858 Added the cause exception class name into the fault message
> ........
>
> 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/NodeDataWriter.java
> cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
> cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
>
> Propchange: cxf/branches/2.4.x-fixes/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 12:30:45 2011
> @@ -1 +1 @@
> -/cxf/trunk:1179846,1180649,1180653,1181611-1181612,1182637,1182715-1182717,1182752
> +/cxf/trunk:1179846,1180649,1180653,1181611-1181612,1182637,1182715-1182717,1182752,1182754
>
> 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=1182802&r1=1182801&r2=1182802&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 Thu Oct 13 12:30:45 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}.
> -COULD_NOT_WRITE_XML_STREAM_CAUSED_BY = Could not generate the XML stream caused by {0}.
> +COULD_NOT_REDA_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}.
>
Needs to be spelled "COULD_NOT_READ_..." :)
Glen
> 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=1182802&r1=1182801&r2=1182802&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 Thu Oct 13 12:30:45 2011
> @@ -66,7 +66,8 @@ 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, e.getMessage());
> + throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
> + e.getClass().getCanonicalName(), e.getMessage());
> }
> }
> return read(input);
>
>
>
> 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=1182802&r1=1182801&r2=1182802&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 Thu Oct 13 12:30:45 2011
> @@ -139,9 +139,11 @@ 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, e.getMessage());
> + throw new Fault("COULD_NOT_REDA_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, e.getMessage());
> + throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
> + e.getClass().getCanonicalName(), e.getMessage());
> }
> }
>
> @@ -225,7 +227,8 @@ public class XMLStreamDataReader impleme
> return new DOMSource(document);
> }
> } catch (XMLStreamException e) {
> - throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e, e.getMessage());
> + throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
> + e.getClass().getCanonicalName(), e.getMessage());
> }
> }
>
>
>
>
--
Glen Mazza
Talend - http://www.talend.com/apache
Blog - http://www.jroller.com/gmazza
Twitter - glenmazza
Re: svn commit: r1182802 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/databinding/source/
Posted by Willem Jiang <wi...@gmail.com>.
Hi Glen,
Thanks for pointing that out, I already committed the fix for it.
On Tue Oct 18 00:57:39 2011, Glen Mazza wrote:
> On 10/13/2011 08:30 AM, ningjiang@apache.org wrote:
>> Author: ningjiang
>> Date: Thu Oct 13 12:30:45 2011
>> New Revision: 1182802
>>
>> URL: http://svn.apache.org/viewvc?rev=1182802&view=rev
>> Log:
>> Merged revisions 1182754 via svnmerge from
>> https://svn.apache.org/repos/asf/cxf/trunk
>>
>> ........
>> r1182754 | ningjiang | 2011-10-13 18:08:19 +0800 (Thu, 13 Oct 2011) |
>> 1 line
>>
>> CXF-3858 Added the cause exception class name into the fault message
>> ........
>>
>> 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/NodeDataWriter.java
>>
>> cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
>>
>> cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
>>
>>
>> Propchange: cxf/branches/2.4.x-fixes/
>> ------------------------------------------------------------------------------
>>
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 12:30:45 2011
>> @@ -1 +1 @@
>> -/cxf/trunk:1179846,1180649,1180653,1181611-1181612,1182637,1182715-1182717,1182752
>>
>> +/cxf/trunk:1179846,1180649,1180653,1181611-1181612,1182637,1182715-1182717,1182752,1182754
>>
>>
>> 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=1182802&r1=1182801&r2=1182802&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
>> Thu Oct 13 12:30:45 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}.
>> -COULD_NOT_WRITE_XML_STREAM_CAUSED_BY = Could not generate the XML
>> stream caused by {0}.
>> +COULD_NOT_REDA_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}.
>>
>
> Needs to be spelled "COULD_NOT_READ_..." :)
>
> Glen
>
>
>> 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=1182802&r1=1182801&r2=1182802&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
>> Thu Oct 13 12:30:45 2011
>> @@ -66,7 +66,8 @@ 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,
>> e.getMessage());
>> + throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
>> + e.getClass().getCanonicalName(), e.getMessage());
>> }
>> }
>> return read(input);
>>
>>
>>
>> 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=1182802&r1=1182801&r2=1182802&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
>> Thu Oct 13 12:30:45 2011
>> @@ -139,9 +139,11 @@ 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,
>> e.getMessage());
>> + throw new Fault("COULD_NOT_REDA_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,
>> e.getMessage());
>> + throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
>> + e.getClass().getCanonicalName(), e.getMessage());
>> }
>> }
>>
>> @@ -225,7 +227,8 @@ public class XMLStreamDataReader impleme
>> return new DOMSource(document);
>> }
>> } catch (XMLStreamException e) {
>> - throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
>> e.getMessage());
>> + throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
>> + e.getClass().getCanonicalName(), e.getMessage());
>> }
>> }
>>
>>
>>
>>
>
>
--
Willem
----------------------------------
FuseSource
Web: http://www.fusesource.com
Blog: http://willemjiang.blogspot.com (English)
http://jnn.javaeye.com (Chinese)
Twitter: willemjiang
Weibo: willemjiang