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/14 08:37:17 UTC
[15/23] isis git commit: ISIS-1194: simplifying
AdapterManagerDefault#existingOrValueAdapter
ISIS-1194: simplifying AdapterManagerDefault#existingOrValueAdapter
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/04ff36a8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/04ff36a8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/04ff36a8
Branch: refs/heads/ISIS-1194
Commit: 04ff36a81525e94f0172b2c1906f053753ea3f42
Parents: f14743b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 11 19:02:06 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 07:36:12 2015 +0100
----------------------------------------------------------------------
.../adaptermanager/AdapterManagerDefault.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/04ff36a8/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
index 330f600..bafb47d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
@@ -201,7 +201,10 @@ public class AdapterManagerDefault implements AdapterManager,
}
// pojo may have been lazily loaded by object store, but we haven't yet seen it
- final ObjectAdapter lazilyLoadedAdapter = lazilyLoaded(pojo);
+ final ObjectAdapter lazilyLoadedAdapter =
+ pojo instanceof Persistable
+ ? persistenceSession.mapPersistent((Persistable) pojo)
+ : null;
if(lazilyLoadedAdapter != null) {
return lazilyLoadedAdapter;
}
@@ -218,16 +221,6 @@ public class AdapterManagerDefault implements AdapterManager,
return null;
}
- private ObjectAdapter lazilyLoaded(Object pojo) {
- if(!(pojo instanceof Persistable)) {
- return null;
- }
- final Persistable persistenceCapable = (Persistable) pojo;
- return persistenceSession.mapPersistent(persistenceCapable);
- }
-
-
-
/**
* {@inheritDoc}
*/