Author: veithen
Date: Sun Aug 14 09:55:23 2011
New Revision: 1157506
URL: http://svn.apache.org/viewvc?rev=1157506&view=rev
Log:
AXIS2-5093: Merged r1157501 to the 1.6 branch.
Added:
axis/axis2/java/core/branches/1_6/modules/transport/http/test/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test/
axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test-resources/
axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/
axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/
axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/axis2/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/
axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/axis2/transport/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/
axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/axis2/transport/http/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/
axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml
- copied unchanged from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test/org/
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/
- copied from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
- copied unchanged from r1157501,
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 14 09:55:23 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,1156305,1156382
+/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,1156305,1156382,1157501
Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1157506&r1=1157505&r2=1157506&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Sun Aug 14
09:55:23 2011
@@ -916,6 +916,13 @@
<artifactId>commons-cli</artifactId>
<version>${commons.cli.version}</version>
</dependency>
+
+ <!-- Jetty is used by some of the unit tests -->
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>5.1.10</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml?rev=1157506&r1=1157505&r2=1157506&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml Sun Aug 14 09:55:23
2011
@@ -81,7 +81,6 @@
<dependency>
<groupId>jetty</groupId>
<artifactId>jetty</artifactId>
- <version>5.1.10</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml?rev=1157506&r1=1157505&r2=1157506&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml Sun Aug 14
09:55:23 2011
@@ -40,6 +40,11 @@
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>test-resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -100,5 +105,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java?rev=1157506&r1=1157505&r2=1157506&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
Sun Aug 14 09:55:23 2011
@@ -305,6 +305,8 @@ public class HTTPSender extends Abstract
method.getStatusText()));
}
} else {
+ // Since we don't process the response, we must release the
connection immediately
+ method.releaseConnection();
throw new AxisFault(Messages.getMessage("transportError",
String.valueOf(statusCode),
method.getStatusText()));
