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/12/17 19:08:30 UTC

svn commit: r1423068 - /cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java

Author: dkulp
Date: Mon Dec 17 18:08:29 2012
New Revision: 1423068

URL: http://svn.apache.org/viewvc?rev=1423068&view=rev
Log:
Merged revisions 1423063 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1423063 | dkulp | 2012-12-17 13:01:22 -0500 (Mon, 17 Dec 2012) | 2 lines

  [CXF-4699] Catch throwable to get the various errors and such as well.

........

Modified:
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=1423068&r1=1423067&r2=1423068&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java Mon Dec 17 18:08:29 2012
@@ -416,7 +416,7 @@ public class W3CDOMStreamReader extends 
             if (o instanceof Location) { 
                 return (Location)o;
             }
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
             //ignore, probably not DOM level 3
         }
         return super.getLocation();