You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/01/24 17:05:05 UTC

cxf git commit: Enabling the HTTPS custom verb test

Repository: cxf
Updated Branches:
  refs/heads/master 789380097 -> 60a0ab978


Enabling the HTTPS custom verb test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/60a0ab97
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/60a0ab97
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/60a0ab97

Branch: refs/heads/master
Commit: 60a0ab9784692a7f71ed0b20240c689e6a380bad
Parents: 7893800
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Jan 24 17:04:46 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Jan 24 17:04:46 2017 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/transport/http/URLConnectionHTTPConduit.java   | 1 -
 .../org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/60a0ab97/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
index 249c735..c73d110 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
@@ -148,7 +148,6 @@ public class URLConnectionHTTPConduit extends HTTPConduit {
             }
             if (b) {
                 try {
-                    boolean set = false;
                     java.lang.reflect.Field f = ReflectionUtil.getDeclaredField(HttpURLConnection.class, "method");
                     if (connection instanceof HttpsURLConnection) {
                         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/60a0ab97/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
index 263156f..0e52a86 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
@@ -111,10 +111,9 @@ public class JAXRSHttpsBookTest extends AbstractBusClientServerTestBase {
     }
     
     @Test
-    @Ignore
     public void testCustomVerbProxyFromSpringWildcard() throws Exception {
         ClassPathXmlApplicationContext ctx =
-            new ClassPathXmlApplicationContext(new String[] {CLIENT_CONFIG_FILE4});
+            new ClassPathXmlApplicationContext(new String[] {CLIENT_CONFIG_FILE3});
         Object bean = ctx.getBean("bookService.proxyFactory");
         assertNotNull(bean);
         JAXRSClientFactoryBean cfb = (JAXRSClientFactoryBean) bean;