mirror of https://github.com/apache/openjpa.git
Fix failure to close some empty result sets.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@442643 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2dfe77f2ca
commit
d1e7a817d2
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel
|
@ -268,6 +268,7 @@ public class JDBCStoreManager
|
|||
Object oid = sm.getObjectId();
|
||||
ClassMapping mapping = (ClassMapping) sm.getMetaData();
|
||||
Result res = null;
|
||||
try {
|
||||
if (info != null && info.result != null) {
|
||||
res = info.result;
|
||||
info.sm = sm;
|
||||
|
@ -304,7 +305,6 @@ public class JDBCStoreManager
|
|||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
// figure out what type of object this is; the state manager
|
||||
// only guarantees to provide a base class
|
||||
Class type;
|
||||
|
@ -454,8 +454,8 @@ public class JDBCStoreManager
|
|||
|
||||
// if the instance is hollow and there's a customized
|
||||
// get by id method, use it
|
||||
if (sm.getLoaded().length() == 0)
|
||||
if (mapping.customLoad(sm, this, null, jfetch))
|
||||
if (sm.getLoaded().length() == 0
|
||||
&& mapping.customLoad(sm, this, null, jfetch))
|
||||
removeLoadedFields(sm, fields);
|
||||
|
||||
//### select is kind of a big object, and in some cases we don't
|
||||
|
|
Loading…
Reference in New Issue