[isis] branch dev/2.0.0/ISIS-1632-meta-annotations updated: ISIS-1632: fixes issue preventing startup (accidentally changed to call the new Annotations.getAnnotations(...), should instead continue to call the original Annotations.getAnnotation(...) method

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/dev/2.0.0/ISIS-1632-meta-annotations by this push:
     new 61d0d70  ISIS-1632: fixes issue preventing startup (accidentally changed to call the new  Annotations.getAnnotations(...), should instead continue to call the original Annotations.getAnnotation(...) method
61d0d70 is described below

commit 61d0d709944f62d2ce67edaf4a4156a352c2aee1
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 30 18:41:58 2017 +0000

    ISIS-1632: fixes issue preventing startup (accidentally changed to call the new  Annotations.getAnnotations(...), should instead continue to call the original Annotations.getAnnotation(...) method
---
 .../isis/core/runtime/services/eventbus/EventBusServiceDefault.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
index 0359f87..14d2e23 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
@@ -61,7 +61,7 @@ public abstract class EventBusServiceDefault extends EventBusService {
         if(domainService instanceof RequestScopedService) {
             // ok; allow to be registered multiple times (each xactn) since stored in a set.
         } else {
-            if (Annotations.getAnnotations(domainService.getClass(), RequestScoped.class) != null) {
+            if (Annotations.getAnnotation(domainService.getClass(), RequestScoped.class) != null) {
                 throw new IllegalArgumentException("Request-scoped services must register their proxy, not themselves");
             }
             // a singleton

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].