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 2013/12/06 17:21:56 UTC
[4/4] git commit: ISIS-627: fix for deleting lazily-loaded pojos
ISIS-627: fix for deleting lazily-loaded pojos
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a8381b5d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a8381b5d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a8381b5d
Branch: refs/heads/master
Commit: a8381b5d60dfc7d6913e2740af04d5c393d65df1
Parents: 3a6a37e
Author: Dan Haywood <da...@apache.org>
Authored: Fri Dec 6 15:55:47 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Dec 6 15:55:47 2013 +0000
----------------------------------------------------------------------
.../services/container/DomainObjectContainerDefault.java | 2 +-
.../isis/core/runtime/system/persistence/PersistenceSession.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a8381b5d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 855a764..8204559 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -185,7 +185,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer, Que
if (persistentObject == null) {
throw new IllegalArgumentException("Must specify a reference for disposing an object");
}
- final ObjectAdapter adapter = getAdapterManager().getAdapterFor(persistentObject);
+ final ObjectAdapter adapter = getAdapterManager().adapterFor(persistentObject);
if (!isPersistent(persistentObject)) {
throw new RepositoryException("Object not persistent: " + adapter);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a8381b5d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index f2a2a17..0471ebe 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -892,7 +892,8 @@ public class PersistenceSession implements Persistor, EnlistedObjectDirtying, To
@Override
public void destroyObject(final ObjectAdapter adapter) {
- if (adapter.getSpecification().isParented()) {
+ ObjectSpecification spec = adapter.getSpecification();
+ if (spec.isParented()) {
return;
}
if (LOG.isDebugEnabled()) {