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 E6E8CE431 for ; Mon, 17 Dec 2012 18:09:06 +0000 (UTC) Received: (qmail 1454 invoked by uid 500); 17 Dec 2012 18:09:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 1371 invoked by uid 500); 17 Dec 2012 18:09:06 -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 1364 invoked by uid 99); 17 Dec 2012 18:09:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Dec 2012 18:09:06 +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, 17 Dec 2012 18:09:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A64EF23889BF; Mon, 17 Dec 2012 18:08:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1423071 - /cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java Date: Mon, 17 Dec 2012 18:08:45 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121217180845.A64EF23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Dec 17 18:08:43 2012 New Revision: 1423071 URL: http://svn.apache.org/viewvc?rev=1423071&view=rev Log: Merged revisions 1423065 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1423065 | dkulp | 2012-12-17 13:01:36 -0500 (Mon, 17 Dec 2012) | 2 lines [CXF-4699] Fix non-dom level 3 issues in BusDefParser ........ Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=1423071&r1=1423070&r2=1423071&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java Mon Dec 17 18:08:43 2012 @@ -78,9 +78,13 @@ public class BusDefinitionParser extends bean.addConstructorArgValue(bus); } else if (!"cxf".equals(bus)) { bean.getRawBeanDefinition().setBeanClass(SpringBus.class); - bean.getRawBeanDefinition().getPropertyValues().removePropertyValue("bus"); bean.setDestroyMethodName("shutdown"); - element.setUserData("ID", bus, null); + try { + element.setUserData("ID", bus, null); + bean.getRawBeanDefinition().getPropertyValues().removePropertyValue("bus"); + } catch (Throwable t) { + //likely not DOM level 3, ignore + } } else { addBusWiringAttribute(bean, BusWiringType.PROPERTY, bus, ctx); bean.getRawBeanDefinition().setAttribute(WIRE_BUS_CREATE, @@ -121,7 +125,12 @@ public class BusDefinitionParser extends @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext ctx) { - String bus = (String)element.getUserData("ID"); + String bus = null; + try { + bus = (String)element.getUserData("ID"); + } catch (Throwable t) { + //ignore + } if (bus == null) { bus = element.getAttribute("bus"); if (StringUtils.isEmpty(bus)) { @@ -132,7 +141,11 @@ public class BusDefinitionParser extends } else { bus = bus + ".config"; } - element.setUserData("ID", bus, null); + try { + element.setUserData("ID", bus, null); + } catch (Throwable t) { + //maybe no DOM level 3, ignore, but, may have issues with the counter + } } return bus; }