cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1180656 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
Date Sun, 09 Oct 2011 17:10:33 GMT
Author: sergeyb
Date: Sun Oct  9 17:10:32 2011
New Revision: 1180656

URL: http://svn.apache.org/viewvc?rev=1180656&view=rev
Log:
Merged revisions 1180655 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1180655 | sergeyb | 2011-10-09 18:08:38 +0100 (Sun, 09 Oct 2011) | 9 lines
  
  Merged revisions 1180653 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1180653 | sergeyb | 2011-10-09 18:04:41 +0100 (Sun, 09 Oct 2011) | 1 line
    
    [CXF-3849] Reverting and logging the stack trace instead of losing it
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct  9 17:10:32 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1179850,1180650
-/cxf/trunk:1179846,1180649
+/cxf/branches/2.4.x-fixes:1179850,1180650,1180655
+/cxf/trunk:1179846,1180649,1180653

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=1180656&r1=1180655&r2=1180656&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
Sun Oct  9 17:10:32 2011
@@ -533,10 +533,14 @@ public abstract class AbstractJAXBProvid
         packageContexts.clear();
     }
     
-    protected static void handleJAXBException(JAXBException e) {
+    protected static String getStackTrace(Exception ex) { 
         StringWriter sw = new StringWriter();
-        e.printStackTrace(new PrintWriter(sw));
-        LOG.warning(sw.toString());
+        ex.printStackTrace(new PrintWriter(sw));
+        return sw.toString();
+    }
+    
+    protected static void handleJAXBException(JAXBException e) {
+        LOG.warning(getStackTrace(e));
         StringBuilder sb = new StringBuilder();
         if (e.getMessage() != null) {
             sb.append(e.getMessage()).append(". ");

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1180656&r1=1180655&r2=1180656&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
Sun Oct  9 17:10:32 2011
@@ -161,8 +161,7 @@ public class JAXBElementProvider extends
         } catch (WebApplicationException e) {
             throw e;
         } catch (Exception e) {
-            LOG.warning("Exception has occurred: " + e.getClass().getName() 
-                    + ", message: " + e.getMessage());
+            LOG.warning(getStackTrace(e));
             throw new WebApplicationException(e);        
         }
         // unreachable



Mime
View raw message