Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix documentation on openjpa.LockManager property. Remove some redundant logic 

from BrokerImpl.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@501171 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
A. Abram White 2007-01-29 20:11:43 +00:00
parent 74823f7cd0
commit 5f76ea2eaf
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
View File

@ -780,17 +780,15 @@ public class BrokerImpl
// after making instance transactional for locking
if (!sm.isTransactional() && useTransactionalState(fetch))
sm.transactional();
boolean loaded = sm.isLoading();
if (!loaded) {
try {
loaded = sm.load(fetch, StateManagerImpl.LOAD_FGS,
exclude, edata, false);
} catch (ObjectNotFoundException onfe) {
if ((flags & OID_NODELETED) != 0
|| (flags & OID_NOVALIDATE) != 0)
throw onfe;
return call.processReturn(oid, null);
}
boolean loaded = false;
try {
loaded = sm.load(fetch, StateManagerImpl.LOAD_FGS,
exclude, edata, false);
} catch (ObjectNotFoundException onfe) {
if ((flags & OID_NODELETED) != 0
|| (flags & OID_NOVALIDATE) != 0)
throw onfe;
return call.processReturn(oid, null);
}
// if no data needed to be loaded and the user wants to

8
openjpa-project/src/doc/manual/ref_guide_conf.xml
View File

@ -1955,18 +1955,20 @@ for managing bidirectional relations upon a flush. See
LockManager</literal>
</para>
<para>
<emphasis role="bold">Default: </emphasis><literal>pessimistic</literal>
<emphasis role="bold">Default: </emphasis><literal>version</literal>
</para>
<para>
<emphasis role="bold">Possible values: </emphasis><literal>none</literal>,
<literal>sjvm</literal>, <literal>pessimistic</literal>
<literal>sjvm</literal>, <literal>pessimistic</literal>,
<literal>version</literal>
</para>
<para>
<emphasis role="bold">Description:</emphasis> A plugin string (see
<xref linkend="ref_guide_conf_plugins"/>) describing a
<ulink url="../javadoc/org/apache/openjpa/kernel/LockManager.html"><classname>
org.apache.openjpa.kernel.LockManager</classname></ulink> to use for acquiring
locks on persistent instances during transactions.
locks on persistent instances during transactions. See
<xref linkend="ref_guide_locking_lockmgr"/> for more information.
</para>
</section>
<section id="openjpa.LockTimeout">