You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openwebbeans.apache.org by ar...@apache.org on 2014/08/31 12:15:20 UTC

svn commit: r1621580 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java

Author: arne
Date: Sun Aug 31 10:15:20 2014
New Revision: 1621580

URL: http://svn.apache.org/r1621580
Log:
OWB-946: Fixed ParameterizedTypesInjectionToParameterizedWithTypeVariableUpperBoundTest

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java?rev=1621580&r1=1621579&r2=1621580&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java Sun Aug 31 10:15:20 2014
@@ -286,7 +286,7 @@ public final class GenericsUtil
             // for this special case it's actually an 'assignable to', thus we swap the params, see CDI-389
             // but this special rule does not apply to Delegate injection points...
             if (!isDelegate &&
-                injectionPointTypeArgument instanceof Class &&
+                (injectionPointTypeArgument instanceof Class || injectionPointTypeArgument instanceof TypeVariable) &&
                 beanTypeArgument instanceof TypeVariable)
             {
                 for (Type upperBound: ((TypeVariable<?>)beanTypeArgument).getBounds())