Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-02-08 02:59:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed some unused code

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@423996 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2006-07-20 17:24:09 +00:00
parent 09e89d9cbb
commit fc9321f35e
3 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -733,7 +733,7 @@ public class BrokerImpl
// make sure all the configured fields are loaded; do this // make sure all the configured fields are loaded; do this
// after making instance transactional for locking // after making instance transactional for locking
if (!sm.isTransactional() if (!sm.isTransactional()
&& useTransactionalState(sm, fetchState. && useTransactionalState(fetchState.
getFetchConfiguration())) getFetchConfiguration()))
sm.transactional(); sm.transactional();
boolean loaded = sm.isLoading(); boolean loaded = sm.isLoading();
@ -824,7 +824,7 @@ public class BrokerImpl
} else { } else {
FetchConfiguration fetch = (fetchState == null) FetchConfiguration fetch = (fetchState == null)
? _fc : fetchState.getFetchConfiguration(); ? _fc : fetchState.getFetchConfiguration();
PCState state = (useTransactionalState(sm, fetch)) PCState state = (useTransactionalState(fetch))
? PCState.PCLEAN : PCState.PNONTRANS; ? PCState.PCLEAN : PCState.PNONTRANS;
sm.setLoading(true); sm.setLoading(true);
try { try {
@ -878,7 +878,7 @@ public class BrokerImpl
List load = null; List load = null;
StateManagerImpl sm; StateManagerImpl sm;
boolean initialized; boolean initialized;
boolean transState = useTransactionalState(null, fetch); boolean transState = useTransactionalState(fetch);
Object obj, oid; Object obj, oid;
int idx = 0; int idx = 0;
for (Iterator itr = oids.iterator(); itr.hasNext(); idx++) { for (Iterator itr = oids.iterator(); itr.hasNext(); idx++) {
@ -898,7 +898,7 @@ public class BrokerImpl
_loading.put(obj, sm); _loading.put(obj, sm);
if (requiresLoad(sm, initialized, edata, flags)) { if (requiresLoad(sm, initialized, edata, flags)) {
transState = transState || useTransactionalState(sm, fetch); transState = transState || useTransactionalState(fetch);
if (initialized && !sm.isTransactional() && transState) if (initialized && !sm.isTransactional() && transState)
sm.transactional(); sm.transactional();
if (load == null) if (load == null)
@ -984,8 +984,7 @@ public class BrokerImpl
/** /**
* Return whether to use a transactional state. * Return whether to use a transactional state.
*/ */
private boolean useTransactionalState(StateManagerImpl sm, private boolean useTransactionalState(FetchConfiguration fetch) {
FetchConfiguration fetch) {
return (_flags & FLAG_ACTIVE) != 0 && (!_optimistic return (_flags & FLAG_ACTIVE) != 0 && (!_optimistic
|| _autoClear == CLEAR_ALL || _autoClear == CLEAR_ALL
|| fetch.getReadLockLevel() != LOCK_NONE); || fetch.getReadLockLevel() != LOCK_NONE);
@ -3328,8 +3327,7 @@ public class BrokerImpl
try { try {
StoreQuery sq = _store.newQuery(language); StoreQuery sq = _store.newQuery(language);
if (sq == null) { if (sq == null) {
ExpressionParser ep = (ExpressionParser) ExpressionParser ep = QueryLanguages.parserForLanguage(language);
QueryLanguages.parserForLanguage(language);
if (ep != null) if (ep != null)
sq = new ExpressionStoreQuery(ep); sq = new ExpressionStoreQuery(ep);
else if (QueryLanguages.LANG_METHODQL.equals(language)) else if (QueryLanguages.LANG_METHODQL.equals(language))
@ -4475,7 +4473,7 @@ public class BrokerImpl
// size may not be entirely accurate due to refs expiring, so // size may not be entirely accurate due to refs expiring, so
// manually copy each object; doesn't matter this way if size too // manually copy each object; doesn't matter this way if size too
// big by some // big by some
ArrayList copy = new ArrayList(size()); List copy = new ArrayList(size());
if (_dirty != null) if (_dirty != null)
for (Iterator itr = _dirty.iterator(); itr.hasNext();) for (Iterator itr = _dirty.iterator(); itr.hasNext();)
copy.add(itr.next()); copy.add(itr.next());

10
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configuration.java
View File

@ -110,16 +110,6 @@ public interface Configuration
*/ */
public Log getConfigurationLog(); public Log getConfigurationLog();
/**
* Return the log to use for management messages.
*/
public Log getManagementLog();
/**
* Return the log to use for profiling messages.
*/
public Log getProfilingLog();
/** /**
* Return the {@link Value} for the given property, or null if none. * Return the {@link Value} for the given property, or null if none.
*/ */

20
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
View File

@ -204,27 +204,11 @@ public class ConfigurationImpl
} }
/** /**
* Returns the logging channel <code>org.apache.openjpa.lib.Runtime</code> by * Returns the logging channel <code>org.apache.openjpa.Runtime</code> by
* default. * default.
*/ */
public Log getConfigurationLog() { public Log getConfigurationLog() {
return getLog("org.apache.openjpa.lib.Runtime"); return getLog("org.apache.openjpa.Runtime");
}
/**
* Returns the logging channel <code>org.apache.openjpa.lib.Manage</code> by
* default.
*/
public Log getManagementLog() {
return getLog("org.apache.openjpa.lib.Manage");
}
/**
* Returns the logging channel <code>org.apache.openjpa.lib.Profile</code> by
* default.
*/
public Log getProfilingLog() {
return getLog("org.apache.openjpa.lib.Profile");
} }
public Value[] getValues() { public Value[] getValues() {