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 2015/09/10 14:07:10 UTC
[11/50] [abbrv] isis git commit: ISIS-1194: simplifying the various
resolveImmediately methods in PersistenceSession
ISIS-1194: simplifying the various resolveImmediately methods in PersistenceSession
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b2590867
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b2590867
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b2590867
Branch: refs/heads/ISIS-1194
Commit: b2590867c069f9dd985c74f4e19bab375f954fdd
Parents: 458ec04
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 08:41:36 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 08:41:36 2015 +0100
----------------------------------------------------------------------
.../system/persistence/PersistenceSession.java | 39 ++++++++------------
1 file changed, 15 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b2590867/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 202786d..26a1be1 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
@@ -720,11 +720,11 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
// cglib bytecode enhancement
synchronized (getAuthenticationSession()) {
Assert.assertTrue("only resolve object that is persistent", adapter, adapter.representsPersistent());
- resolveImmediatelyFromPersistenceLayer(adapter);
+ resolveImmediatelyInTransaction(adapter);
}
}
- private void resolveImmediatelyFromPersistenceLayer(final ObjectAdapter adapter) {
+ private void resolveImmediatelyInTransaction(final ObjectAdapter adapter) {
getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
@Override
public void preExecute() {
@@ -737,7 +737,19 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
@Override
public void execute() {
- objectStoreResolveImmediately(adapter);
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("resolveImmediately; oid=" + adapter.getOid().enString(oidMarshaller));
+ }
+
+ if (!adapter.representsPersistent()) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("; not persistent - ignoring");
+ }
+ return;
+ }
+
+ refreshRoot(adapter);
}
@Override
@@ -758,27 +770,6 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
//endregion
- //region > objectStoreResolveImmediately
-
- public void objectStoreResolveImmediately(final ObjectAdapter adapter) {
- ensureOpened();
- ensureInTransaction();
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("resolveImmediately; oid=" + adapter.getOid().enString(oidMarshaller));
- }
-
- if (!adapter.representsPersistent()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("; not persistent - ignoring");
- }
- return;
- }
-
- refreshRoot(adapter);
- }
-
- //endregion
//region > refreshRoot
/**