[isis] branch master updated: ISIS-1827 add null checks to fix test-case Roundtrip#happyCase

[ah...@apache.org]

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new ca84b34  ISIS-1827 add null checks to fix test-case Roundtrip#happyCase
ca84b34 is described below

commit ca84b3460cda8be2f45372213f8bb1496d30fc5a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 22 05:39:59 2018 +0100

    ISIS-1827 add null checks to fix test-case Roundtrip#happyCase
---
 .../src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
index 4ca819d..79eefb1 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
@@ -96,7 +96,7 @@ public final class CommonDtoUtils {
         if (valueType != null) {
             return valueType;
         }
-        if (type.isEnum()) {
+        if (type!=null && type.isEnum()) {
             return ValueType.ENUM;
         }
         // assume reference otherwise
@@ -238,7 +238,7 @@ public final class CommonDtoUtils {
         case REFERENCE: {
             final Bookmark bookmark = val instanceof Bookmark
                     ? (Bookmark) val
-                    : bookmarkService.bookmarkFor(val);
+                    : bookmarkService!=null ? bookmarkService.bookmarkFor(val) : null;
 
             if (bookmark != null) {
                 OidDto argValue = bookmark.toOidDto();

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