incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1354262 - in /incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence: adapterfactory/pojo/PojoAdapter.java adaptermanager/AdapterManagerDefault.java
Date Tue, 26 Jun 2012 22:09:13 GMT
Author: danhaywood
Date: Tue Jun 26 22:09:13 2012
New Revision: 1354262

URL: http://svn.apache.org/viewvc?rev=1354262&view=rev
Log:
ISIS-234: hash idea seemed to have worked.  At any rate, those failing tests are now passing

Modified:
    incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
    incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java

Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java?rev=1354262&r1=1354261&r2=1354262&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
Tue Jun 26 22:09:13 2012
@@ -227,7 +227,6 @@ public class PojoAdapter extends Instanc
     @Override
     public ObjectAdapter getAggregateRoot() {
         if(!isParented()) {
-            //throw new IllegalStateException("This adapter is not parented (it's OID is
not of type ParentedOid); oid:" + oid);
             return this;
         }
         ParentedOid parentedOid = (ParentedOid) oid;

Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java?rev=1354262&r1=1354261&r2=1354262&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java
Tue Jun 26 22:09:13 2012
@@ -366,17 +366,14 @@ public class AdapterManagerDefault exten
      * 
      * <p>
      * Note that there is no management of {@link Version}s here. That is
-     * because the {@link PersistenceSession} is expected to manage this. (In
-     * practice this is done by the <tt>ObjectAdapterStore</tt> implementation
-     * delegated by the <tt>PersistenceSession</tt>, and propagated
-     * back to client-side as required).
+     * because the {@link PersistenceSession} is expected to manage this.
      * 
-     * @param hintRootOid - intended for testing, allow a different persistent root oid to
be provided.  Must be persistent and compatible with the adapter's type
+     * @param hintRootOid - allow a different persistent root oid to be provided.
      */
     @Override
     public void remapAsPersistent(final ObjectAdapter adapter, RootOid hintRootOid) {
         
-        final ObjectAdapter rootAdapter = adapter.getAggregateRoot();
+        final ObjectAdapter rootAdapter = adapter.getAggregateRoot();  // REVIEW: think this
is redundant; would seem this method is only ever called for roots anyway.
         final RootOid transientRootOid = (RootOid) rootAdapter.getOid();
 
         Ensure.ensureThatArg(rootAdapter.isTransient(), is(true), "root adapter should be
transient; oid:" + transientRootOid);



Mime
View raw message