svn commit: r1174622 - in /axis/axis2/java/core/branches/1_6: ./ modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java

[sagara]

Author: sagara
Date: Fri Sep 23 09:47:43 2011
New Revision: 1174622

URL: http://svn.apache.org/viewvc?rev=1174622&view=rev
Log:
Merged r1174618 to the 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 09:47:43 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618

Modified: 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=1174622&r1=1174621&r2=1174622&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
 Fri Sep 23 09:47:43 2011
@@ -82,7 +82,7 @@ public class HTTPWorker implements Worke
                 response.addHeader(new BasicHeader("Location", contextPath));
                 return;
             }
-            if (uri.endsWith("axis2/services/")) {
+            if (uri.endsWith(contextPath)) {
                 String s = 
HTTPTransportReceiver.getServicesHTML(configurationContext);
                 response.setStatus(HttpStatus.SC_OK);
                 response.setContentType("text/html");