You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/07/02 18:46:46 UTC
svn commit: r673438 - in /cxf/branches/2.0.x-fixes: ./
common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Author: dkulp
Date: Wed Jul 2 09:46:45 2008
New Revision: 673438
URL: http://svn.apache.org/viewvc?rev=673438&view=rev
Log:
Merged revisions 673146 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r673146 | dkulp | 2008-07-01 13:29:06 -0400 (Tue, 01 Jul 2008) | 1 line
Remove comment as I fixed the issue it was complaining about.
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=673438&r1=673437&r2=673438&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java (original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java Wed Jul 2 09:46:45 2008
@@ -180,7 +180,6 @@
throw new IllegalStateException(propertyName + " property must have child elements!");
}
- // Seems odd that we have to do the registration, I wonder if there is a better way
String id;
BeanDefinition child;
if (first.getNamespaceURI().equals(BeanDefinitionParserDelegate.BEANS_NAMESPACE_URI)) {