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/09/10 18:33:18 UTC
[2/2] git commit: ISIS-643: speculative fix to add a guard to an NPE
if post delete processing.
ISIS-643: speculative fix to add a guard to an NPE if post delete processing.
... based, unfortunately, only on the supplied stacktrace and a bit of guesswork, since no reproducible case available.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/750bf207
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/750bf207
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/750bf207
Branch: refs/heads/master
Commit: 750bf2077b4609ac341310e5a742d2bce8e3d550
Parents: 915556b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 10 17:32:00 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 10 17:32:00 2014 +0100
----------------------------------------------------------------------
.../jdo/datanucleus/persistence/FrameworkSynchronizer.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/750bf207/core/objectstore-jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java b/core/objectstore-jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
index 619430d..af75db2 100644
--- a/core/objectstore-jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
+++ b/core/objectstore-jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
@@ -300,6 +300,9 @@ public class FrameworkSynchronizer {
@Override
public void run() {
ObjectAdapter adapter = getAdapterManager().getAdapterFor(pojo);
+ if(adapter == null) {
+ return;
+ }
if(!adapter.isDestroyed()) {
adapter.changeState(ResolveState.DESTROYED);
}