You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/02/20 14:11:01 UTC
[5/5] git commit: ISIS-708: BookmarkService null handling
ISIS-708: BookmarkService null handling
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/48de256e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/48de256e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/48de256e
Branch: refs/heads/master
Commit: 48de256e6060accfa3a664b73e503f397f73328a
Parents: f10d671
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 20 13:04:05 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 20 13:04:05 2014 +0000
----------------------------------------------------------------------
.../services/bookmarks/BookmarkServiceDefault.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/48de256e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
index de4505e..ea5bf2a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
@@ -81,7 +81,11 @@ public class BookmarkServiceDefault implements BookmarkService, DomainObjectServ
if(bookmark == null) {
return null;
}
- return domainObjectServices.lookup(bookmark);
+ try {
+ return domainObjectServices.lookup(bookmark);
+ } catch(org.apache.isis.core.runtime.persistence.ObjectNotFoundException ex) {
+ return null;
+ }
}
@SuppressWarnings("unchecked")
@@ -94,6 +98,9 @@ public class BookmarkServiceDefault implements BookmarkService, DomainObjectServ
@Hidden
@Override
public Bookmark bookmarkFor(final Object domainObject) {
+ if(domainObject == null) {
+ return null;
+ }
return domainObjectServices.bookmarkFor(domainObject);
}