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 3792710FD9 for ; Mon, 19 Aug 2013 16:32:23 +0000 (UTC) Received: (qmail 60429 invoked by uid 500); 19 Aug 2013 16:32:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 60387 invoked by uid 500); 19 Aug 2013 16:32:22 -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 60378 invoked by uid 99); 19 Aug 2013 16:32:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Aug 2013 16:32:22 +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; Mon, 19 Aug 2013 16:32:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7DA5123889D5; Mon, 19 Aug 2013 16:32:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1515499 - in /cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws: WrapperClassGenerator.java support/JaxWsServiceFactoryBean.java Date: Mon, 19 Aug 2013 16:32:01 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130819163201.7DA5123889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Aug 19 16:32:01 2013 New Revision: 1515499 URL: http://svn.apache.org/r1515499 Log: Merged revisions 1515487 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1515487 | dkulp | 2013-08-19 12:12:15 -0400 (Mon, 19 Aug 2013) | 2 lines Slight optimization to avoid checking the ASM stuff unless it's actually needed ........ Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=1515499&r1=1515498&r2=1515499&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Mon Aug 19 16:32:01 2013 @@ -110,21 +110,6 @@ public final class WrapperClassGenerator } public Set> generate() { - try { - if (createClassWriter() == null) { - throw new ClassNotFoundException(); - } - } catch (Throwable t) { - for (OperationInfo opInfo : interfaceInfo.getOperations()) { - if (opInfo.isUnwrappedCapable() - && (opInfo.getUnwrappedOperation() - .getProperty(ReflectionServiceFactoryBean.WRAPPERGEN_NEEDED) != null)) { - LOG.warning(opInfo.getName() + "requires a wrapper bean but problems with" - + " ASM has prevented creating one. Operation may not work correctly."); - } - } - return wrapperBeans; - } for (OperationInfo opInfo : interfaceInfo.getOperations()) { if (opInfo.isUnwrappedCapable()) { Method method = (Method)opInfo.getProperty(ReflectionServiceFactoryBean.METHOD); @@ -162,11 +147,16 @@ public final class WrapperClassGenerator Method method, boolean isRequest) { + + ClassWriter cw = createClassWriter(); + if (cw == null) { + LOG.warning(op.getName() + "requires a wrapper bean but problems with" + + " ASM has prevented creating one. Operation may not work correctly."); + return; + } QName wrapperElement = messageInfo.getName(); - boolean anonymous = factory.getAnonymousWrapperTypes(); - ClassWriter cw = createClassWriter(); String pkg = getPackageName(method) + ".jaxws_asm" + (anonymous ? "_an" : ""); String className = pkg + "." + StringUtils.capitalize(op.getName().getLocalPart()); Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1515499&r1=1515498&r2=1515499&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Mon Aug 19 16:32:01 2013 @@ -108,7 +108,6 @@ public class JaxWsServiceFactoryBean ext private List setWsFeatures; private List wsFeatures; - private boolean wrapperBeanGenerated; private Set> wrapperClasses; @@ -133,7 +132,6 @@ public class JaxWsServiceFactoryBean ext @Override public void reset() { super.reset(); - wrapperBeanGenerated = false; wrapperClasses = null; } @@ -636,9 +634,7 @@ public class JaxWsServiceFactoryBean ext @Override protected Set> getExtraClass() { Set> classes = new HashSet>(); - if (!wrapperBeanGenerated) { - wrapperClasses = generatedWrapperBeanClass(); - } + wrapperClasses = generatedWrapperBeanClass(); if (wrapperClasses != null) { classes.addAll(wrapperClasses); }