Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E8BBE1082C for ; Wed, 23 Apr 2014 06:30:44 +0000 (UTC) Received: (qmail 23776 invoked by uid 500); 23 Apr 2014 06:30:44 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 23302 invoked by uid 500); 23 Apr 2014 06:30:39 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 23148 invoked by uid 99); 23 Apr 2014 06:30:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2014 06:30:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2014 06:30:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 804292388993; Wed, 23 Apr 2014 06:30:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1589348 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: event/NotificationManager.java util/GenericsUtil.java Date: Wed, 23 Apr 2014 06:30:12 -0000 To: commits@openwebbeans.apache.org From: arne@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140423063012.804292388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: arne Date: Wed Apr 23 06:30:11 2014 New Revision: 1589348 URL: http://svn.apache.org/r1589348 Log: OWB-946: Fixed handling of parameterized injection point and raw bean/event type (org.jboss.cdi.tck.tests.event.parameterized.ParameterizedEventTest.testEventObjectTypeUsed) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1589348&r1=1589347&r2=1589348&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Wed Apr 23 06:30:11 2014 @@ -152,21 +152,24 @@ public final class NotificationManager Set> matching = new HashSet>(); - Type eventType = GenericsUtil.resolveType(declaredEventType, eventClass); + Set eventTypes = GenericsUtil.getTypeClosure(declaredEventType, eventClass); Set observedTypes = observers.keySet(); for (Type observedType : observedTypes) { - if (GenericsUtil.isAssignableFrom(false, observedType, eventType)) + for (Type eventType : eventTypes) { - Set> observerMethods = observers.get(observedType); - - for (ObserverMethod observerMethod : observerMethods) + if (GenericsUtil.isAssignableFrom(false, observedType, eventType)) { - matching.add((ObserverMethod) observerMethod); + Set> observerMethods = observers.get(observedType); + + for (ObserverMethod observerMethod : observerMethods) + { + matching.add((ObserverMethod) observerMethod); + } + break; } - break; } } return matching; 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=1589348&r1=1589347&r2=1589348&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 Wed Apr 23 06:30:11 2014 @@ -224,13 +224,33 @@ public final class GenericsUtil } else { - throw new IllegalArgumentException("Unsupported type " + injectionPointType.getClass()); + throw new IllegalArgumentException("Unsupported type " + beanType.getClass()); } } private static boolean isAssignableFrom(boolean isDelegate, ParameterizedType injectionPointType, Class beanType) { - return isAssignableFrom(isDelegate, injectionPointType.getRawType(), beanType); + Class rawInjectionPointType = getRawType(injectionPointType); + if (rawInjectionPointType.equals(beanType)) + { + return true; + } + if (!rawInjectionPointType.isAssignableFrom(beanType)) + { + return false; + } + if (beanType.getSuperclass() != null && isAssignableFrom(isDelegate, injectionPointType, beanType.getGenericSuperclass())) + { + return true; + } + for (Type genericInterface: beanType.getGenericInterfaces()) + { + if (isAssignableFrom(isDelegate, injectionPointType, genericInterface)) + { + return true; + } + } + return false; } private static boolean isAssignableFrom(boolean isDelegate, ParameterizedType injectionPointType, TypeVariable beanType)