Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 14748 invoked from network); 23 Feb 2011 16:46:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Feb 2011 16:46:49 -0000 Received: (qmail 91221 invoked by uid 500); 23 Feb 2011 16:46:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 91114 invoked by uid 500); 23 Feb 2011 16:46:48 -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 91107 invoked by uid 99); 23 Feb 2011 16:46:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Feb 2011 16:46:48 +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; Wed, 23 Feb 2011 16:46:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 59FD123889E7; Wed, 23 Feb 2011 16:46:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1073820 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java Date: Wed, 23 Feb 2011 16:46:25 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110223164625.59FD123889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Feb 23 16:46:24 2011 New Revision: 1073820 URL: http://svn.apache.org/viewvc?rev=1073820&view=rev Log: Merged revisions 1073385 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1073385 | sergeyb | 2011-02-22 11:24:57 -0500 (Tue, 22 Feb 2011) | 1 line JAX-RS: minimize the excessive logging in case of client models ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java?rev=1073820&r1=1073819&r2=1073820&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java Wed Feb 23 16:46:24 2011 @@ -187,6 +187,7 @@ public final class JAXRSClientFactory { JAXRSClientFactoryBean bean = WebClient.getBean(baseAddress, configLocation); bean.setProviders(providers); bean.setModelRef(modelRef); + bean.setServiceClass(cls); return bean.create(cls); } @@ -204,6 +205,7 @@ public final class JAXRSClientFactory { JAXRSClientFactoryBean bean = WebClient.getBean(baseAddress, null); bean.setProviders(providers); bean.setModelRef(modelRef); + bean.setServiceClass(cls); if (threadSafe) { bean.setInitialState(new ThreadLocalClientState(baseAddress)); } @@ -233,8 +235,10 @@ public final class JAXRSClientFactory { public static T createFromModel(String baseAddress, Class cls, List modelBeans, List providers, String configLocation) { JAXRSClientFactoryBean bean = WebClient.getBean(baseAddress, configLocation); + bean.setProviders(providers); bean.setModelBeans(modelBeans); + bean.setServiceClass(cls); return bean.create(cls); } Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java?rev=1073820&r1=1073819&r2=1073820&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java Wed Feb 23 16:46:24 2011 @@ -31,6 +31,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.ResourceBundle; +import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.http.HttpServletResponse; @@ -237,7 +238,9 @@ public class JAXRSOutInterceptor extends Object entity = getEntity(responseObj); try { responseType = checkFinalContentType(responseType); - LOG.fine("Response content type is: " + responseType.toString()); + if (LOG.isLoggable(Level.FINE)) { + LOG.fine("Response content type is: " + responseType.toString()); + } message.put(Message.CONTENT_TYPE, responseType.toString()); long size = writer.getSize(entity, targetType, genericType, annotations, responseType); @@ -246,8 +249,9 @@ public class JAXRSOutInterceptor extends + writer.getClass().getName()); responseHeaders.putSingle(HttpHeaders.CONTENT_LENGTH, Long.toString(size)); } - - LOG.fine("Response EntityProvider is: " + writer.getClass().getName()); + if (LOG.isLoggable(Level.FINE)) { + LOG.fine("Response EntityProvider is: " + writer.getClass().getName()); + } try { writer.writeTo(entity, targetType, genericType, annotations,