Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1431059 -
 /cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
Date: Wed, 09 Jan 2013 20:54:24 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20130109205424.BA50C2388A3D@eris.apache.org>

Author: dkulp
Date: Wed Jan  9 20:54:24 2013
New Revision: 1431059

URL: http://svn.apache.org/viewvc?rev=1431059&view=rev
Log:
Merged revisions 1430991 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1430991 | dkulp | 2013-01-09 13:05:28 -0500 (Wed, 09 Jan 2013) | 18 lines

  Merged revisions 1430985 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1430985 | dkulp | 2013-01-09 13:03:31 -0500 (Wed, 09 Jan 2013) | 10 lines

    Merged revisions 1430976 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1430976 | dkulp | 2013-01-09 12:55:24 -0500 (Wed, 09 Jan 2013) | 2 lines

      Remove test that tests the ancient and long since deprecated OldImpl.  URL seems to cache the handler which causes issues with later tests and it's not likely to ever be hit anymore using modern JDK's

    ........

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java?rev=1431059&r1=1431058&r2=1431059&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java Wed Jan  9 20:54:24 2013
@@ -127,32 +127,9 @@ public class HTTPConduitURLConnectionTes
         assertTrue("TLS Client Parameters should generate an HttpsURLConnection instead of " 
             + connection.getClass().getName(),
             HttpsURLConnection.class.isInstance(connection));
-    }
+        HttpURLConnection con = (HttpURLConnection)connection;
+        con.disconnect();
 
-    /**
-     * This verifys that the underlying connection is an HttpsURLConnection.
-     */
-    @Test
-    public void testTLSServerParametersWithDeprecatedSunSSLProtocol() throws Exception {
-        if (!System.getProperty("java.vm.vendor").toLowerCase().contains("sun")) {
-            return;
-        }
-        String javaProtocolHandlerPkgsKey = "java.protocol.handler.pkgs";
-        String javaProtocolHandlerPkgsValue = System.getProperty(javaProtocolHandlerPkgsKey);
-        try {
-            System.setProperty(javaProtocolHandlerPkgsKey, "com.sun.net.ssl.internal.www.protocol");
-            Object connection = doTestTLSServerParameters();
-            assertNotNull("Connection should not be null", connection);
-            assertTrue("TLS Client Parameters should generate an HttpsURLConnection instead of " 
-                           + connection.getClass().getName(),
-                    connection.getClass().getName().contains("HttpsURLConnection"));
-        } finally {
-            if (javaProtocolHandlerPkgsValue == null) {
-                System.clearProperty(javaProtocolHandlerPkgsKey);
-            } else {
-                System.setProperty(javaProtocolHandlerPkgsKey, javaProtocolHandlerPkgsValue);
-            }
-        }
     }
     
     private Object doTestTLSServerParameters() throws Exception {