Index: openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java =================================================================== --- openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (revision 501403) +++ openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (working copy) @@ -122,7 +122,7 @@ _broker.lock(); try { if (_fetch == null) - _fetch = _emf.toFetchPlan(_broker, + _fetch = _emf.toFetchPlan(_broker, _broker.getFetchConfiguration()); return _fetch; } finally { @@ -853,6 +853,7 @@ } public Object getDelegate() { + _broker.assertOpen(); return this; } @@ -1104,5 +1105,5 @@ if (!(other instanceof EntityManagerImpl)) return false; return _broker.equals(((EntityManagerImpl) other)._broker); - } + } }