| commit | d41b98e5e11daef3bfd02b570d43ebf4337edab1 | [log] [tgz] |
|---|---|---|
| author | Martin Taal <mtaal@elver.org> | Mon Oct 22 09:09:30 2012 +0200 |
| committer | Martin Taal <mtaal@elver.org> | Mon Oct 22 09:09:30 2012 +0200 |
| tree | 97a40103eb729a77deafcce028ca827aab387c7c | |
| parent | e6795049af5e095f734ed08f16f80131a1dabfaa [diff] |
Made size call on lists non-loading
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/elist/HibernatePersistableEList.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/elist/HibernatePersistableEList.java index 680e41c..d1e58df 100755 --- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/elist/HibernatePersistableEList.java +++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/elist/HibernatePersistableEList.java
@@ -540,6 +540,9 @@ @Override protected int delegateSize() { + if (delegate instanceof AbstractPersistentCollection && !isInitialized() && !isLoaded()) { + return delegate.size(); + } return delegateList().size(); }
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceAction.java index 79d086a..c445c53 100755 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceAction.java
@@ -258,7 +258,7 @@ newLib.setName("tstlib"); res.getContents().add(newLib); lib.getWriters().remove(writer); - assertTrue(lib.getBooks().size() > 0); // force load of books to + assertTrue(lib.getBooks().get(0) != null); // force load of books to // prevent dangling error // in jpox newLib.getWriters().add(writer);