svn commit: r1050632 - in /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http: AbstractHTTPSender.java HTTPSender.java
Author: veithen
Date: Sat Dec 18 13:01:41 2010
New Revision: 1050632
URL: http://svn.apache.org/viewvc?rev=1050632&view=rev
Log:
The HTTP transport makes the assumption that if useSeparateListener=true, then
the response is always a 202. This is not always true, e.g. when WS-RM is used.
Fixed to code so that the HttpMethod is always stored in the MessageContext if
the response code is not 202. This is necessary (but maybe not sufficient) to
ensure proper cleanup of the connection.
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?rev=1050632&r1=1050631&r2=1050632&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
Sat Dec 18 13:01:41 2010
@@ -539,9 +539,6 @@ public abstract class AbstractHTTPSender
HttpMethod method) throws IOException {
HostConfiguration config = this.getHostConfiguration(httpClient,
msgContext, url);
-if (!msgContext.getOptions().isUseSeparateListener())
-msgContext.setProperty(HTTPConstants.HTTP_METHOD, method);
-
// set the custom headers, if available
addCustomHeaders(method, msgContext);
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java?rev=1050632&r1=1050631&r2=1050632&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
Sat Dec 18 13:01:41 2010
@@ -266,6 +266,8 @@ public class HTTPSender extends Abstract
int statusCode = method.getStatusCode();
log.trace("Handling response - " + statusCode);
if (statusCode == HttpStatus.SC_OK) {
+// Save the HttpMethod so that we can release the connection when
cleaning up
+msgContext.setProperty(HTTPConstants.HTTP_METHOD, method);
processResponse(method, msgContext);
} else if (statusCode == HttpStatus.SC_ACCEPTED) {
/* When an HTTP 202 Accepted code has been received, this will
be the case of an execution
@@ -276,6 +278,8 @@ public class HTTPSender extends Abstract
method.releaseConnection();
} else if (statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR ||
statusCode == HttpStatus.SC_BAD_REQUEST) {
+// Save the HttpMethod so that we can release the connection when
cleaning up
+msgContext.setProperty(HTTPConstants.HTTP_METHOD, method);
Header contenttypeHeader =
method.getResponseHeader(HTTPConstants.HEADER_CONTENT_TYPE);
String value = null;
svn commit: r1050656 - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/util
Author: veithen Date: Sat Dec 18 16:07:44 2010 New Revision: 1050656 URL: http://svn.apache.org/viewvc?rev=1050656&view=rev Log: Merged r1050632 to the 1.5 branch. We will need this fix for Sandesha2. Modified: axis/axis2/java/core/branches/1_5/ (props changed) axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 18 16:07:44 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,937004,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956 ,1034010,1034015,1034142,1034173,1034213,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1042118,1042416,1042442,1042527 +/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,937004,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956 ,1034010,1034015,1034142,1034173,1034213,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1042118,1042416,1042442,1042527,1050632 /webservices/axis2/trunk/java:728674,
svn commit: r1050658 - /axis/axis2/java/sandesha/branches/1_4/pom.xml
Author: veithen Date: Sat Dec 18 16:08:51 2010 New Revision: 1050658 URL: http://svn.apache.org/viewvc?rev=1050658&view=rev Log: Resolved snapshot dependencies, except for Axis2, which is set to the 1.5 branch. Modified: axis/axis2/java/sandesha/branches/1_4/pom.xml Modified: axis/axis2/java/sandesha/branches/1_4/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/pom.xml?rev=1050658&r1=1050657&r2=1050658&view=diff == --- axis/axis2/java/sandesha/branches/1_4/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_4/pom.xml Sat Dec 18 16:08:51 2010 @@ -365,10 +365,10 @@ -SNAPSHOT -SNAPSHOT -1.2.11-SNAPSHOT -3.0.0-SNAPSHOT +1.5.4-SNAPSHOT +1.5 +1.2.10 +2.0.4 1.1.1 3.8.2 1.2.15
svn commit: r1050705 - /axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Author: veithen
Date: Sat Dec 18 20:16:48 2010
New Revision: 1050705
URL: http://svn.apache.org/viewvc?rev=1050705&view=rev
Log:
Make sure that if useSeparateListener=true and the response code is 200, the
transport is cleaned up properly to avoid connection pool starvation.
Modified:
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Modified:
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=1050705&r1=1050704&r2=1050705&view=diff
==
---
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Sat Dec 18 20:16:48 2010
@@ -682,6 +682,9 @@ public class SenderWorker extends Sandes
//if the syncResponseWas not built here and the client
was not expecting a sync response. We will not try to execute
//here. Doing so will cause a double invocation for a
async message.
if (msgCtx.getOptions().isUseSeparateListener()==true
&& !syncResponseBuilt) {
+ // Since the client is not expecting a sync
response, it will not (necessarily) call cleanup.
+ // If we discard the response, then we need to
clean up here.
+
msgCtx.getTransportOut().getSender().cleanup(msgCtx);
return;
}
svn commit: r1050713 - in /axis/axis2/java/sandesha/branches/1_4: ./ modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Author: veithen
Date: Sat Dec 18 20:50:54 2010
New Revision: 1050713
URL: http://svn.apache.org/viewvc?rev=1050713&view=rev
Log:
Merged r1050705 to the 1.4 branch. This should make the test suite pass with
Axis2 1.5.4-SNAPSHOT.
Modified:
axis/axis2/java/sandesha/branches/1_4/ (props changed)
axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Propchange: axis/axis2/java/sandesha/branches/1_4/
--
svn:mergeinfo = /axis/axis2/java/sandesha/trunk:1050705
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=1050713&r1=1050712&r2=1050713&view=diff
==
---
axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Sat Dec 18 20:50:54 2010
@@ -682,6 +682,9 @@ public class SenderWorker extends Sandes
//if the syncResponseWas not built here and the client
was not expecting a sync response. We will not try to execute
//here. Doing so will cause a double invocation for a
async message.
if (msgCtx.getOptions().isUseSeparateListener()==true
&& !syncResponseBuilt) {
+ // Since the client is not expecting a sync
response, it will not (necessarily) call cleanup.
+ // If we discard the response, then we need to
clean up here.
+
msgCtx.getTransportOut().getSender().cleanup(msgCtx);
return;
}
svn commit: r1050724 - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/util
Author: veithen Date: Sat Dec 18 21:46:16 2010 New Revision: 1050724 URL: http://svn.apache.org/viewvc?rev=1050724&view=rev Log: AXIS2-3793: Merged r1050589 to the 1.5 branch. Modified: axis/axis2/java/core/branches/1_5/ (props changed) axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/installationguide.xml.vm Propchange: axis/axis2/java/core/branches/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 18 21:46:16 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,937004,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956 ,1034010,1034015,1034142,1034173,1034213,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1042118,1042416,1042442,1042527,1050632 +/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,937004,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956 ,1034010,1034015,1034142,1034173,1034213,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1042118,1042416,1042442,1042527,1050589,1050632 /webservices/axis2/trunk/java:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,7
svn commit: r1050763 - /axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
Author: samisa
Date: Sun Dec 19 05:46:56 2010
New Revision: 1050763
URL: http://svn.apache.org/viewvc?rev=1050763&view=rev
Log:
Closed the file reader - it had not been closed
Modified:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
Modified:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java?rev=1050763&r1=1050762&r2=1050763&view=diff
==
---
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
Sun Dec 19 05:46:56 2010
@@ -128,6 +128,7 @@ public class CorbaUtil implements CorbaC
char[] buf = new char[1000];
fileReader.read(buf);
obj = orb.string_to_object((new String(buf)).trim());
+fileReader.close();
} else if (iorString!=null) {
obj = orb.string_to_object(((String)
iorString.getValue()).trim());
} else {
svn commit: r1050768 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Author: samisa
Date: Sun Dec 19 06:37:59 2010
New Revision: 1050768
URL: http://svn.apache.org/viewvc?rev=1050768&view=rev
Log:
Fixed the problem of AxisFault not giving correct QName in some case. In case
of REST, this might not make sense, but for the sake of SOAP fault
completeness, we can set the detail - AXIS2-3520
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1050768&r1=1050767&r2=1050768&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Sun Dec 19 06:37:59 2010
@@ -526,7 +526,9 @@ public class Utils {
// If its a REST response the content is not a SOAP envelop
and hence we will
// Have use the soap body as the exception
if (messageContext.isDoingREST() && soapBody.getFirstElement()
!= null) {
-return new
AxisFault(soapBody.getFirstElement().toString());
+ AxisFault fault = new
AxisFault(soapBody.getFirstElement().toString());
+ fault.setDetail(soapBody.getFirstElement());
+ return fault;
}
// if axis2 receives an rest type fault for an soap message
then message context
@@ -535,7 +537,9 @@ public class Utils {
if
((messageContext.getProperty(Constants.Configuration.MESSAGE_TYPE) != null) &&
messageContext.getProperty(Constants.Configuration.MESSAGE_TYPE).equals(HTTPConstants.MEDIA_TYPE_APPLICATION_XML)){
if (soapBody.getFirstElement() != null){
- return new
AxisFault(soapBody.getFirstElement().toString());
+AxisFault fault = new
AxisFault(soapBody.getFirstElement().toString());
+fault.setDetail(soapBody.getFirstElement());
+return fault;
} else {
return new AxisFault("application/xml type error
received.");
}
