You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by am...@apache.org on 2009/08/25 09:57:02 UTC
svn commit: r807512 -
/webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
Author: amilas
Date: Tue Aug 25 07:57:01 2009
New Revision: 807512
URL: http://svn.apache.org/viewvc?rev=807512&view=rev
Log:
remove the dependency of AxisServletListener. Now any one can use their own transport listners as before
the recent change to AxisServlet.
Modified:
webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
Modified: webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java?rev=807512&r1=807511&r2=807512&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java Tue Aug 25 07:57:01 2009
@@ -619,16 +619,23 @@
// is called.
private void preprocessRequest(HttpServletRequest req) throws ServletException {
initContextRoot(req);
-
- AxisServletListener listener = req.isSecure() ? httpsListener : httpListener;
- if (listener == null) {
+
+ TransportInDescription transportInDescription =
+ req.isSecure()? this.axisConfiguration.getTransportIn(Constants.TRANSPORT_HTTP) :
+ this.axisConfiguration.getTransportIn(Constants.TRANSPORT_HTTPS);
+
+ if (transportInDescription == null){
throw new ServletException(req.getScheme() + " is forbidden");
} else {
- // Autodetect the port number if necessary
- if (listener.getPort() == -1) {
- listener.setPort(req.getServerPort());
+ if (transportInDescription.getReceiver() instanceof AxisServletListener){
+ AxisServletListener listner = (AxisServletListener) transportInDescription.getReceiver();
+ // Autodetect the port number if necessary
+ if (listner.getPort() == -1){
+ listner.setPort(req.getServerPort());
+ }
}
}
+
}
/**