Author: sergeyb
Date: Fri Oct 2 14:06:51 2009
New Revision: 821026
URL: http://svn.apache.org/viewvc?rev=821026&view=rev
Log:
Merged revisions 821021 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r821021 | dkulp | 2009-10-02 14:44:54 +0100 (Fri, 02 Oct 2009) | 1 line
Remove an unneeded SuppressWarnings annotation
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 2 14:06:51 2009
@@ -1 +1 @@
-/cxf/trunk:821008
+/cxf/trunk:821008,821021
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java?rev=821026&r1=821025&r2=821026&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
Fri Oct 2 14:06:51 2009
@@ -68,7 +68,6 @@
}
}
- @SuppressWarnings("unchecked")
@Override
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean,
Element el, String name) {
if ("properties".equals(name)
