Author: alessio.soldano(a)jboss.com
Date: 2013-05-29 12:24:56 -0400 (Wed, 29 May 2013)
New Revision: 17628
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
Log:
Minor improvement, do not look for QueryHandlerRegistry for non wsdl get calls
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
---
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-05-29
16:24:02 UTC (rev 17627)
+++
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-05-29
16:24:56 UTC (rev 17628)
@@ -194,39 +194,40 @@
* @return true if there was a query handler that successfully handled the request,
false otherwise
* @throws ServletException if some problem occurs
*/
- private boolean handleQuery(HttpServletRequest req, HttpServletResponse res,
AbstractHTTPDestination dest, Bus bus)
+ private final boolean handleQuery(HttpServletRequest req, HttpServletResponse res,
AbstractHTTPDestination dest, Bus bus)
throws ServletException
{
- boolean hasQuery = (null != req.getQueryString()) &&
(req.getQueryString().length() > 0);
- boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class)
!= null;
-
- if (hasQuery && queryHandlerRegistryExists)
+ final String queryString = req.getQueryString();
+ if ((null != queryString) && (queryString.length() > 0))
{
- String ctxUri = req.getRequestURI();
- String baseUri = req.getRequestURL().toString() + "?" +
req.getQueryString();
- EndpointInfo endpointInfo = dest.getEndpointInfo();
- ServerConfig serverConfig =
AbstractServerConfig.getServerIntegrationServerConfig();
- if (serverConfig.isModifySOAPAddress()) {
- endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL,
-
ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()));
- }
-
- for (QueryHandler queryHandler :
bus.getExtension(QueryHandlerRegistry.class).getHandlers())
- {
- if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo))
+ final QueryHandlerRegistry qhr = bus.getExtension(QueryHandlerRegistry.class);
+ if (qhr != null) {
+ final String ctxUri = req.getRequestURI();
+ final String baseUri = req.getRequestURL().toString() + "?" +
queryString;
+ final EndpointInfo endpointInfo = dest.getEndpointInfo();
+ final ServerConfig serverConfig =
AbstractServerConfig.getServerIntegrationServerConfig();
+ if (serverConfig.isModifySOAPAddress()) {
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL,
+
ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()));
+ }
+
+ for (QueryHandler queryHandler : qhr.getHandlers())
{
- res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri));
- try
+ if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo))
{
- OutputStream out = res.getOutputStream();
- queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out);
- out.flush();
- return true;
+ res.setContentType(queryHandler.getResponseContentType(baseUri,
ctxUri));
+ try
+ {
+ OutputStream out = res.getOutputStream();
+ queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out);
+ out.flush();
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw new ServletException(e);
+ }
}
- catch (Exception e)
- {
- throw new ServletException(e);
- }
}
}
}
Show replies by date