You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by os...@apache.org on 2014/01/04 09:30:49 UTC
git commit: ISIS-644: Update FrameworkSynchronizer to avoid the
"Object not yet known to Isis" exception
Updated Branches:
refs/heads/master c58864e6d -> 716ea4a00
ISIS-644: Update FrameworkSynchronizer to avoid the "Object not yet known to Isis" exception
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/716ea4a0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/716ea4a0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/716ea4a0
Branch: refs/heads/master
Commit: 716ea4a00e8f06ffde9e90629cdfacde928f2a10
Parents: c58864e
Author: Oscar Bou <os...@apache.org>
Authored: Sat Jan 4 09:26:39 2014 +0100
Committer: Oscar Bou <os...@apache.org>
Committed: Sat Jan 4 09:26:39 2014 +0100
----------------------------------------------------------------------
.../jdo/datanucleus/persistence/FrameworkSynchronizer.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/716ea4a0/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
index f675ed8..28bd126 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
@@ -348,11 +348,7 @@ public class FrameworkSynchronizer {
// make sure the entity is known to Isis and is a root
// TODO: will probably need to handle aggregated entities at some point...
void ensureRootObject(final PersistenceCapable pojo) {
- final ObjectAdapter adapter = getAdapterManager().getAdapterFor(pojo);
- if(adapter == null) {
- throw new IsisException(MessageFormat.format("Object not yet known to Isis: {0}", pojo));
- }
- final Oid oid = adapter.getOid();
+ final Oid oid = getAdapterManager().adapterFor(pojo).getOid();
if (!(oid instanceof RootOid)) {
throw new IsisException(MessageFormat.format("Not a RootOid: oid={0}, for {1}", oid, pojo));
}