You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/12/12 11:49:30 UTC

svn commit: r1550395 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java

Author: sergeyb
Date: Thu Dec 12 10:49:29 2013
New Revision: 1550395

URL: http://svn.apache.org/r1550395
Log:
Merged revisions 1550390 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1550390 | sergeyb | 2013-12-12 10:24:58 +0000 (Thu, 12 Dec 2013) | 1 line
  
  Fixing a typo in JAXBElementProvider
........

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

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1550390

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

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1550395&r1=1550394&r2=1550395&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java Thu Dec 12 10:49:29 2013
@@ -294,7 +294,7 @@ public class JAXBElementProvider<T> exte
                 marshal(actualObject, actualClass, genericType, encoding, os, m, anns);
             }
         } catch (JAXBException e) {
-            handleJAXBException(e, true);
+            handleJAXBException(e, false);
         }  catch (WebApplicationException e) {
             throw e;
         } catch (Exception e) {