Author: dkulp Date: Tue Aug 14 15:48:44 2012 New Revision: 1372939 URL: http://svn.apache.org/viewvc?rev=1372939&view=rev Log: Merged revisions 1372934 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1372934 | dkulp | 2012-08-14 11:45:24 -0400 (Tue, 14 Aug 2012) | 18 lines Merged revisions 1372930 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1372930 | dkulp | 2012-08-14 11:39:47 -0400 (Tue, 14 Aug 2012) | 10 lines 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.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java?rev=1372939&r1=1372938&r2=1372939&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java (original) +++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java Tue Aug 14 15:48:44 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) {
