Return-Path: <commits-return-6496-archive-asf-public=cust-asf.ponee.io@openwebbeans.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id B6219200CA3
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu,  1 Jun 2017 13:54:31 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id B4E5D160BDF; Thu,  1 Jun 2017 11:54:31 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 036E9160BB5
	for <archive-asf-public@cust-asf.ponee.io>; Thu,  1 Jun 2017 13:54:30 +0200 (CEST)
Received: (qmail 55972 invoked by uid 500); 1 Jun 2017 11:54:30 -0000
Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openwebbeans.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openwebbeans.apache.org>
List-Post: <mailto:commits@openwebbeans.apache.org>
List-Id: <commits.openwebbeans.apache.org>
Reply-To: dev@openwebbeans.apache.org
Delivered-To: mailing list commits@openwebbeans.apache.org
Received: (qmail 55959 invoked by uid 99); 1 Jun 2017 11:54:30 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2017 11:54:30 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 8273D3A0352
	for <commits@openwebbeans.apache.org>; Thu,  1 Jun 2017 11:54:29 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1797208 - in /openwebbeans/trunk:
 webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
 webbeans-tck/standalone-suite.xml
Date: Thu, 01 Jun 2017 11:54:29 -0000
To: commits@openwebbeans.apache.org
From: struberg@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170601115429.8273D3A0352@svn01-us-west.apache.org>
archived-at: Thu, 01 Jun 2017 11:54:31 -0000

Author: struberg
Date: Thu Jun  1 11:54:29 2017
New Revision: 1797208

URL: http://svn.apache.org/viewvc?rev=1797208&view=rev
Log:
OWB-1189 observer methods must not be @Observes and @ObservesAsync at the same time

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
    openwebbeans/trunk/webbeans-tck/standalone-suite.xml

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java?rev=1797208&r1=1797207&r2=1797208&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java Thu Jun  1 11:54:29 2017
@@ -127,7 +127,7 @@ public class ObserverMethodsBuilder<T>
         
         AnnotatedMethod<?> annotatedMethod = (AnnotatedMethod<?>)annotatedParameter.getDeclaringCallable();
 
-        if (annotatedMethod.isAnnotationPresent(Produces.class) 
+        if (annotatedMethod.isAnnotationPresent(Produces.class)
                 || annotatedMethod.isAnnotationPresent(Inject.class))
         {
             throw new WebBeansConfigurationException("Observer method : " + annotatedMethod.getJavaMember().getName() + " in class : " 
@@ -148,13 +148,21 @@ public class ObserverMethodsBuilder<T>
             //Check Reception
             Reception reception;
             Observes observes = annotatedParameter.getAnnotation(Observes.class);
+            ObservesAsync observesAsync = annotatedParameter.getAnnotation(ObservesAsync.class);
+
+            if (observes != null && observesAsync != null)
+            {
+                throw new WebBeansConfigurationException("Observer method : " + annotatedMethod.getJavaMember().getName() + " in class : "
+                    + annotatedMethod.getJavaMember().getDeclaringClass().getName()
+                    + " can not be annotated with both @Observes *and* @ObservesAsync!");
+            }
+
             if (observes != null)
             {
                 reception = observes.notifyObserver();
             }
             else
             {
-                ObservesAsync observesAsync = annotatedParameter.getAnnotation(ObservesAsync.class);
                 reception = observesAsync.notifyObserver();
             }
 

Modified: openwebbeans/trunk/webbeans-tck/standalone-suite.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/standalone-suite.xml?rev=1797208&r1=1797207&r2=1797208&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/standalone-suite.xml (original)
+++ openwebbeans/trunk/webbeans-tck/standalone-suite.xml Thu Jun  1 11:54:29 2017
@@ -121,6 +121,11 @@
                 <methods><exclude name=".*"/></methods>
             </class>
 
+            <!-- https://issues.jboss.org/browse/CDITCK-586 -->
+            <class name="org.jboss.cdi.tck.tests.event.observer.async.basic.MixedObserversTest">
+                <methods><exclude name="testAsyncObserversCalledInDifferentThread"/></methods>
+            </class>
+
 
 
             <!--