svn commit: r1236007 - /tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java

[hl...@apache.org]

Author: hlship
Date: Thu Jan 26 00:51:26 2012
New Revision: 1236007

URL: http://svn.apache.org/viewvc?rev=1236007&view=rev
Log:
TAP5-1831: DelegatingInjectionResources does not pass generic type information to its first delegate

Modified:
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java?rev=1236007&r1=1236006&r2=1236007&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java Thu Jan 26 00:51:26 2012
@@ -1,4 +1,4 @@
-//  Copyright 2008 The Apache Software Foundation
+//  Copyright 2008, 2012 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public class DelegatingInjectionResource
 
     public <T> T findResource(Class<T> type, Type genericType)
     {
-        T result = first.findResource(type, null);
+        T result = first.findResource(type, genericType);
 
         return result != null ? result : next.findResource(type, genericType);
     }