You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/10/11 17:59:22 UTC
[isis] branch v2 updated: ISIS-2003: DomainServiceLayoutFacet:
revert last changes and restore original behavior
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 5f957ca ISIS-2003: DomainServiceLayoutFacet: revert last changes and restore original behavior
5f957ca is described below
commit 5f957ca14b74156d4d3fec2163854f90e2f4a4e9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 11 19:59:14 2018 +0200
ISIS-2003: DomainServiceLayoutFacet: revert last changes and restore
original behavior
Task-Url: https://issues.apache.org/jira/browse/ISIS-2003
---
.../object/domainservicelayout/DomainServiceLayoutFacetFactory.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
index d99a7dc..bf63f42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
@@ -43,8 +43,7 @@ public class DomainServiceLayoutFacetFactory extends FacetFactoryAbstract {
final DomainService domainService = Annotations.getAnnotation(cls, DomainService.class);
final DomainServiceLayout domainServiceLayout = Annotations.getAnnotation(cls, DomainServiceLayout.class);
- final boolean bothAnnotationsArePresent = domainService != null && domainServiceLayout != null;
- if (!bothAnnotationsArePresent) {
+ if (domainService == null && domainServiceLayout == null) {
return;
}