svn commit: r1530360 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java

[sergeyb]

Author: sergeyb
Date: Tue Oct  8 17:18:08 2013
New Revision: 1530360

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

........
  r1530350 | sergeyb | 2013-10-08 18:03:09 +0100 (Tue, 08 Oct 2013) | 1 line
  
  [CXF-5319] Minor simplification to WADLGenerator when JSON is requested
........

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/model/wadl/WadlGenerator.java

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

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/model/wadl/WadlGenerator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1530360&r1=1530359&r2=1530360&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 Tue Oct  8 17:18:08 2013
@@ -249,7 +249,7 @@ public class WadlGenerator implements Re
         sbMain.append(sbResources.toString());
         sbMain.append("</application>");
 
-        m.getExchange().put(JAXRSUtils.IGNORE_MESSAGE_WRITERS, 
ignoreMessageWriters);
+        m.getExchange().put(JAXRSUtils.IGNORE_MESSAGE_WRITERS, !isJson && 
ignoreMessageWriters);
         return 
Response.ok().type(type).entity(createResponseEntity(sbMain.toString(), 
isJson)).build();
     }