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

danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 6eb767fd80500f9ef6157009d3022d81420b86bd
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Tue Feb 13 16:47:30 2018 +0000

    ISIS-1829: adds condition for a builder that inherits from 
AppManifestAbstract2.Builder
---
 .../java/org/apache/isis/applib/AppManifestAbstract.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java 
b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
index 905f8ef..f74223a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
@@ -64,8 +64,10 @@ public abstract class AppManifestAbstract implements 
AppManifest {
         if (overriddenAuthMechanism != null) {
             return overriddenAuthMechanism;
         } else {
-            if(builder instanceof Builder) {
-                return ((Builder) builder).authMechanism;
+            if(builder instanceof AppManifestAbstract.Builder) {
+                return ((AppManifestAbstract.Builder) builder).authMechanism;
+            } else if(builder instanceof AppManifestAbstract2.Builder) {
+                return ((AppManifestAbstract2.Builder) builder).authMechanism;
             } else {
                 return null;
             }
@@ -74,8 +76,10 @@ public abstract class AppManifestAbstract implements 
AppManifest {
 
     private List<Class<? extends FixtureScript>> determineFixtures(final 
ModuleOrBuilderAbstract<?> builder) {
         final List<Class<? extends FixtureScript>> builderFixtures;
-        if(builder instanceof Builder) {
-            builderFixtures = ((Builder) builder).fixtures;
+        if(builder instanceof AppManifestAbstract.Builder) {
+            builderFixtures = ((AppManifestAbstract.Builder) builder).fixtures;
+        } else if(builder instanceof AppManifestAbstract2.Builder) {
+            builderFixtures = ((AppManifestAbstract2.Builder) 
builder).fixtures;
         } else {
             builderFixtures = Lists.newArrayList();
         }

-- 
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.

Reply via email to