Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0B223108AA for ; Tue, 30 Apr 2013 11:06:28 +0000 (UTC) Received: (qmail 73233 invoked by uid 500); 30 Apr 2013 11:06:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 73118 invoked by uid 500); 30 Apr 2013 11:06:27 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 73097 invoked by uid 99); 30 Apr 2013 11:06:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Apr 2013 11:06:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Apr 2013 11:06:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8331B23888E7; Tue, 30 Apr 2013 11:06:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1477553 - in /cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client: LocalClientState.java ThreadLocalClientState.java Date: Tue, 30 Apr 2013 11:06:05 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130430110605.8331B23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Apr 30 11:06:05 2013 New Revision: 1477553 URL: http://svn.apache.org/r1477553 Log: [CXF-4992] Minor cleanup Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java?rev=1477553&r1=1477552&r2=1477553&view=diff ============================================================================== --- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java (original) +++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java Tue Apr 30 11:06:05 2013 @@ -46,8 +46,7 @@ public class LocalClientState implements public LocalClientState(URI baseURI) { this.baseURI = baseURI; - String scheme = baseURI.getScheme(); - if (!StringUtils.isEmpty(scheme) && scheme.startsWith(HTTP_SCHEME)) { + if (isHttpScheme(baseURI)) { this.currentBuilder = UriBuilder.fromUri(baseURI); } else { this.currentBuilder = UriBuilder.fromUri("/"); @@ -127,7 +126,7 @@ public class LocalClientState implements MultivaluedMap headers, MultivaluedMap templatesMap) { ClientState state = null; - if (!StringUtils.isEmpty(currentURI.getScheme()) && currentURI.getScheme().startsWith(HTTP_SCHEME)) { + if (isHttpScheme(currentURI)) { state = new LocalClientState(currentURI); } else { state = new LocalClientState(baseURI, currentURI); @@ -145,4 +144,8 @@ public class LocalClientState implements state.setTemplates(newTemplateParams); return state; } + + private static boolean isHttpScheme(URI uri) { + return !StringUtils.isEmpty(uri.getScheme()) && uri.getScheme().startsWith(HTTP_SCHEME); + } } Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java?rev=1477553&r1=1477552&r2=1477553&view=diff ============================================================================== --- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java (original) +++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java Tue Apr 30 11:06:05 2013 @@ -28,15 +28,12 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; -import org.apache.cxf.common.util.StringUtils; - /** * Keeps the client state such as the baseURI, currentURI, requestHeaders, current response * in a thread local storage * */ public class ThreadLocalClientState implements ClientState { - private static final String HTTP_SCHEME = "http"; private Map state = Collections.synchronizedMap(new WeakHashMap()); @@ -106,14 +103,7 @@ public class ThreadLocalClientState impl public ClientState newState(URI currentURI, MultivaluedMap headers, MultivaluedMap templates) { - LocalClientState ls = null; - if (!StringUtils.isEmpty(currentURI.getScheme()) && currentURI.getScheme().startsWith(HTTP_SCHEME)) { - ls = new LocalClientState(currentURI); - } else { - ls = new LocalClientState(initialState.getBaseURI(), currentURI); - } - ls.setRequestHeaders(headers); - ls.setTemplates(templates); + LocalClientState ls = (LocalClientState)initialState.newState(currentURI, headers, templates); return new ThreadLocalClientState(ls, timeToKeepState); }