Author: dkulp
Date: Tue Aug 14 15:39:47 2012
New Revision: 1372930
URL: http://svn.apache.org/viewvc?rev=1372930&view=rev
Log:
Merged revisions 1372928 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1372928 | dkulp | 2012-08-14 11:37:37 -0400 (Tue, 14 Aug 2012) | 2 lines
Ooopss... useless double cast
........
Modified:
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
Modified:
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java?rev=1372930&r1=1372929&r2=1372930&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
Tue Aug 14 15:39:47 2012
@@ -71,7 +71,7 @@ public class BusApplicationContextResour
if (resourceName == null) {
resource = resourceType.cast(context.getBean(resourceType));
} else {
- resource =
resourceType.cast(resourceType.cast(context.getBean(resourceName,
resourceType)));
+ resource = resourceType.cast(context.getBean(resourceName,
resourceType));
}
return resource;
} catch (NoSuchBeanDefinitionException def) {
