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 2014/03/14 11:39:00 UTC
git commit: [CXF-5428] response.getWriter() is called too early
Repository: cxf
Updated Branches:
refs/heads/master 1ec43095d -> bd6138034
[CXF-5428] response.getWriter() is called too early
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bd613803
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bd613803
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bd613803
Branch: refs/heads/master
Commit: bd61380340980c1e91c525f146fb943946162e97
Parents: 1ec4309
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Mar 14 10:38:44 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Fri Mar 14 10:38:44 2014 +0000
----------------------------------------------------------------------
.../servlet/servicelist/ServiceListGeneratorServlet.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bd613803/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
index 43a70dd..8912fb3 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
@@ -19,7 +19,6 @@
package org.apache.cxf.transport.servlet.servicelist;
import java.io.IOException;
-import java.io.PrintWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -83,7 +82,6 @@ public class ServiceListGeneratorServlet extends HttpServlet {
request.removeAttribute(ServletController.AUTH_SERVICE_LIST);
request.removeAttribute(ServletController.AUTH_SERVICE_LIST_REALM);
}
- PrintWriter writer = response.getWriter();
AbstractDestination[] destinations = destinationRegistry.getSortedDestinations();
if (request.getParameter("stylesheet") != null) {
renderStyleSheet(request, response);
@@ -123,7 +121,7 @@ public class ServiceListGeneratorServlet extends HttpServlet {
}
response.setContentType(serviceListWriter.getContentType());
Object basePath = request.getAttribute(Message.BASE_PATH);
- serviceListWriter.writeServiceList(writer,
+ serviceListWriter.writeServiceList(response.getWriter(),
basePath == null ? null : basePath.toString(),
soapEndpoints, restEndpoints);
}