Author: ningjiang
Date: Tue Jun 12 23:31:56 2007
New Revision: 546749
URL: http://svn.apache.org/viewvc?view=rev&rev=546749
Log:
Reopened the HTTPS 401 Redirect test and the Default sequential Strategy test
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?view=diff&rev=546749&r1=546748&r2=546749
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Tue Jun 12 23:31:56 2007
@@ -390,13 +390,13 @@
OutputStream responseStream = flushHeaders(outMessage);
if (null != responseStream) {
wrappedStream = responseStream;
- }
+ }
}
/**
* Perform any actions required on stream closure (handle response
etc.)
*/
- protected void doClose() throws IOException {
+ public void close() throws IOException {
if (wrappedStream == null) {
OutputStream responseStream = flushHeaders(outMessage);
if (null != responseStream) {
@@ -406,8 +406,7 @@
commitResponse();
}
- protected void onWrite() throws IOException {
- }
+
private void commitResponse() {
try {
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java?view=diff&rev=546749&r1=546748&r2=546749
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
Tue Jun 12 23:31:56 2007
@@ -45,7 +45,6 @@
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
@@ -280,8 +279,7 @@
isWSAEnabledForCurrentEndpoint());
}
- @Test
- @Ignore
+ @Test
public void testDefaultSequentialStrategy() throws Exception {
strategyTest(REPLICA_B, REPLICA_C, REPLICA_A, false);
}
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java?view=diff&rev=546749&r1=546748&r2=546749
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
Tue Jun 12 23:31:56 2007
@@ -61,7 +61,6 @@
import org.apache.hello_world.services.SOAPService;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -766,8 +765,7 @@
* This tests redirects through Gordy to Bethal. Bethal will
* supply a series of 401s. See PushBack401.
*/
- @Test
- @Ignore
+ @Test
public void testHttpsRedirect401Response() throws Exception {
startServer("Gordy");
startServer("Bethal");