Revision: 4017
http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4017&view=rev
Author: andy_jefferson
Date: 2008-11-22 10:11:48 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
[NUCCORE-157] Simplify further the PM proxy idea. Just store the delegate PM in the PMF thread-local and *not* in the proxy itself. When the proxy needs the PM it just asks the PMF what is the latest. This allows for the delegate PM being closed and a new one opened. Hence the proxy can just be used endlessly.
Modified Paths:
--------------
platform/core/trunk/src/java/org/datanucleus/jdo/JDOPersistenceManagerFactory.java
platform/core/trunk/src/java/org/datanucleus/jdo/JDOPersistenceManagerProxy.java
Modified: platform/core/trunk/src/java/org/datanucleus/jdo/JDOPersistenceManagerFactory.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/jdo/JDOPersistenceManagerFactory.java 2008-11-22 09:51:13 UTC (rev 4016)
+++ platform/core/trunk/src/java/org/datanucleus/jdo/JDOPersistenceManagerFactory.java 2008-11-22 10:11:48 UTC (rev 4017)
@@ -762,30 +762,14 @@
*/
public PersistenceManager getPersistenceManagerProxy()
{
- JDOPersistenceManager delegatePM = (JDOPersistenceManager)pmProxyThreadLocal.get();
String txnType = getTransactionType();
if (TransactionType.RESOURCE_LOCAL.toString().equalsIgnoreCase(txnType))
{
- if (delegatePM != null)
- {
- // Wrap our existing delegate with a new proxy
- return new JDOPersistenceManagerProxy(delegatePM);
- }
- else
- {
- // Create a new proxy with new delegate and save it in the thread-local
- return getPersistenceManagerProxy(
- this.getPersistenceConfiguration().getStringProperty("datanucleus.ConnectionUserName"),
- this.getPersistenceConfiguration().getStringProperty("datanucleus.ConnectionPassword"));
- }
+ return new JDOPersistenceManagerProxy(this);
}
else if (TransactionType.JTA.toString().equalsIgnoreCase(txnType))
{
- // TODO Finish this
- // Create a new proxy with new delegate and save it in the thread-local
- return getPersistenceManagerProxy(
- this.getPersistenceConfiguration().getStringProperty("datanucleus.ConnectionUserName"),
- this.getPersistenceConfiguration().getStringProperty("datanucleus.ConnectionPassword"));
+ return new JDOPersistenceManagerProxy(this);
}
else
{
@@ -794,54 +778,30 @@
}
/**
- * Convenience method to update the thread-local delegate PM that we refer to.
- * A null PM implies that it is now closed and so the thread-local should be cleared.
- * @param pm The PM
+ * Convenience accessor for the thread-local delegate PM for this thread.
+ * @return The PM (if set)
*/
- void setPMProxy(JDOPersistenceManager pm)
+ JDOPersistenceManager getPMProxyDelegate()
{
+ JDOPersistenceManager pm = (JDOPersistenceManager)pmProxyThreadLocal.get();
if (pm == null)
{
- pmProxyThreadLocal.remove();
- }
- else
- {
+ // No delegate for this thread so create one and store it
+ pm = new JDOPersistenceManager(this,
+ this.getPersistenceConfiguration().getStringProperty("datanucleus.ConnectionUserName"),
+ this.getPersistenceConfiguration().getStringProperty("datanucleus.ConnectionPassword"));
pmProxyThreadLocal.set(pm);
}
+ return pm;
}
/**
- * Get an instance of <tt>PersistenceManager</tt> proxy from this factory.
- * The instance has default values for options. The parameters userid/password are used when obtaining
- * datastore connections from the connection pool.
- * <p>After the first use of getPersistenceManager, no "set" methods will succeed.</p>
- * @param userName the user name for the connection
- * @param password the password for the connection
- * @return <tt>PersistenceManager</tt> instance with default options.
+ * Convenience method to clear the thread-local delegate PM that we refer to.
+ * This is invoked when the proxy PM has close() invoked.
*/
- public synchronized PersistenceManager getPersistenceManagerProxy(String userName, String password)
+ void clearPMProxyDelegate()
{
- assertIsOpen();
-
- // Freeze the PMF config now that we are handing out PM's
- freezeConfiguration();
-
- JDOPersistenceManagerProxy pm = new JDOPersistenceManagerProxy(this, userName, password);
-
- if (lifecycleListeners != null)
- {
- // Add PMF lifecycle listeners to the PM
- Iterator listenerIter = lifecycleListeners.iterator();
- while (listenerIter.hasNext())
- {
- LifecycleListenerForClass listener = (LifecycleListenerForClass) listenerIter.next();
- pm.addInstanceLifecycleListener(listener.getListener(), listener.getClasses());
- }
- }
-
- // TODO Cache the proxies ?
-
- return pm;
+ pmProxyThreadLocal.remove();
}
/**
Modified: platform/core/trunk/src/java/org/datanucleus/jdo/JDOPersistenceManagerProxy.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/jdo/JDOPersistenceManagerProxy.java 2008-11-22 09:51:13 UTC (rev 4016)
+++ platform/core/trunk/src/java/org/datanucleus/jdo/JDOPersistenceManagerProxy.java 2008-11-22 10:11:48 UTC (rev 4017)
@@ -55,60 +55,25 @@
*/
public class JDOPersistenceManagerProxy implements PersistenceManager
{
- JDOPersistenceManagerFactory pmf;
- String pmfUserName;
- String pmfPassword;
+ protected JDOPersistenceManagerFactory pmf;
- /** Delegate PM. */
- JDOPersistenceManager pm;
-
/**
- * Constructor for a PM proxy where no PM delegate is available.
- * @param apmf PMF
- * @param userName Username to connect
- * @param password Password to connect
+ * Constructor for a PM proxy.
*/
- public JDOPersistenceManagerProxy(JDOPersistenceManagerFactory apmf, String userName, String password)
+ public JDOPersistenceManagerProxy(JDOPersistenceManagerFactory pmf)
{
- this.pmf = apmf;
- this.pmfUserName = userName;
- this.pmfPassword = password;
-
- createNewDelegatePM();
+ this.pmf = pmf;
}
/**
- * Constructor for a PM proxy where a PM delegate is available.
- * @param pm The PM to delegate to
+ * Accessor for the delegate PM that we hand off to.
+ * @return The delegate PM (from the PM thread-local store)
*/
- public JDOPersistenceManagerProxy(JDOPersistenceManager pm)
+ protected PersistenceManager getPM()
{
- this.pm = pm;
- // TODO Cater for JTA reuse of PM
+ return pmf.getPMProxyDelegate();
}
- /**
- * Convenience method to create a new PM to delegate to.
- */
- protected void createNewDelegatePM()
- {
- pm = new JDOPersistenceManager(pmf, pmfUserName, pmfPassword);
- ((JDOPersistenceManagerFactory)pm.getPersistenceManagerFactory()).setPMProxy(pm);
- }
-
- /**
- * Convenience method to check if the delegate PM is set, and if not then create a new delegate.
- * With RESOURCE_LOCAL, when the PM is closed the delegate is closed and nulled. Any subsequent
- * operation should create a new delegate PM.
- */
- protected void checkPM()
- {
- if (pm == null)
- {
- createNewDelegatePM();
- }
- }
-
/*
* (non-Javadoc)
* @see javax.jdo.PersistenceManager#close()
@@ -119,9 +84,8 @@
if (TransactionType.RESOURCE_LOCAL.toString().equalsIgnoreCase(txnType))
{
// Close the PM and unset the thread-local
- pm.close();
- ((JDOPersistenceManagerFactory)pm.getPersistenceManagerFactory()).setPMProxy(null);
- pm = null;
+ getPM().close();
+ pmf.clearPMProxyDelegate();
}
else if (TransactionType.JTA.toString().equalsIgnoreCase(txnType))
{
@@ -136,8 +100,7 @@
*/
public void addInstanceLifecycleListener(InstanceLifecycleListener listener, Class... classes)
{
- checkPM();
- pm.addInstanceLifecycleListener(listener, classes);
+ getPM().addInstanceLifecycleListener(listener, classes);
}
/*
@@ -146,8 +109,7 @@
*/
public void checkConsistency()
{
- checkPM();
- pm.checkConsistency();
+ getPM().checkConsistency();
}
/*
@@ -156,8 +118,7 @@
*/
public Transaction currentTransaction()
{
- checkPM();
- return pm.currentTransaction();
+ return getPM().currentTransaction();
}
/*
@@ -166,8 +127,7 @@
*/
public void deletePersistent(Object obj)
{
- checkPM();
- pm.deletePersistent(obj);
+ getPM().deletePersistent(obj);
}
/*
@@ -176,8 +136,7 @@
*/
public void deletePersistentAll(Object... pcs)
{
- checkPM();
- pm.deletePersistentAll(pcs);
+ getPM().deletePersistentAll(pcs);
}
/*
@@ -186,8 +145,7 @@
*/
public void deletePersistentAll(Collection pcs)
{
- checkPM();
- pm.deletePersistentAll(pcs);
+ getPM().deletePersistentAll(pcs);
}
/*
@@ -196,8 +154,7 @@
*/
public <T> T detachCopy(T pc)
{
- checkPM();
- return (T)pm.detachCopy(pc);
+ return getPM().detachCopy(pc);
}
/*
@@ -206,8 +163,7 @@
*/
public <T> Collection<T> detachCopyAll(Collection<T> pcs)
{
- checkPM();
- return pm.detachCopyAll(pcs);
+ return getPM().detachCopyAll(pcs);
}
/*
@@ -216,8 +172,7 @@
*/
public <T> T[] detachCopyAll(T... pcs)
{
- checkPM();
- return (T[])pm.detachCopyAll(pcs);
+ return getPM().detachCopyAll(pcs);
}
/*
@@ -226,8 +181,7 @@
*/
public void evict(Object obj)
{
- checkPM();
- pm.evict(obj);
+ getPM().evict(obj);
}
/*
@@ -236,8 +190,7 @@
*/
public void evictAll()
{
- checkPM();
- pm.evictAll();
+ getPM().evictAll();
}
/*
@@ -246,8 +199,7 @@
*/
public void evictAll(Object... pcs)
{
- checkPM();
- pm.evictAll(pcs);
+ getPM().evictAll(pcs);
}
/*
@@ -256,8 +208,7 @@
*/
public void evictAll(Collection pcs)
{
- checkPM();
- pm.evictAll(pcs);
+ getPM().evictAll(pcs);
}
/*
@@ -266,8 +217,7 @@
*/
public void evictAll(boolean subclasses, Class cls)
{
- checkPM();
- pm.evictAll(subclasses, cls);
+ getPM().evictAll(subclasses, cls);
}
/*
@@ -276,8 +226,7 @@
*/
public void flush()
{
- checkPM();
- pm.flush();
+ getPM().flush();
}
/*
@@ -286,8 +235,7 @@
*/
public boolean getCopyOnAttach()
{
- checkPM();
- return pm.getCopyOnAttach();
+ return getPM().getCopyOnAttach();
}
/*
@@ -296,8 +244,7 @@
*/
public JDOConnection getDataStoreConnection()
{
- checkPM();
- return pm.getDataStoreConnection();
+ return getPM().getDataStoreConnection();
}
/*
@@ -306,8 +253,7 @@
*/
public boolean getDetachAllOnCommit()
{
- checkPM();
- return pm.getDetachAllOnCommit();
+ return getPM().getDetachAllOnCommit();
}
/*
@@ -316,8 +262,7 @@
*/
public <T> Extent<T> getExtent(Class<T> pcClass)
{
- checkPM();
- return pm.getExtent(pcClass);
+ return getPM().getExtent(pcClass);
}
/*
@@ -326,8 +271,7 @@
*/
public <T> Extent<T> getExtent(Class<T> pcClass, boolean subclasses)
{
- checkPM();
- return pm.getExtent(pcClass, subclasses);
+ return getPM().getExtent(pcClass, subclasses);
}
/*
@@ -336,7 +280,6 @@
*/
public FetchGroup getFetchGroup(Class arg0, String arg1)
{
- checkPM();
return getFetchGroup(arg0, arg1);
}
@@ -346,8 +289,7 @@
*/
public FetchPlan getFetchPlan()
{
- checkPM();
- return pm.getFetchPlan();
+ return getPM().getFetchPlan();
}
/*
@@ -356,8 +298,7 @@
*/
public boolean getIgnoreCache()
{
- checkPM();
- return pm.getIgnoreCache();
+ return getPM().getIgnoreCache();
}
/*
@@ -366,8 +307,7 @@
*/
public Set getManagedObjects()
{
- checkPM();
- return pm.getManagedObjects();
+ return getPM().getManagedObjects();
}
/*
@@ -376,8 +316,7 @@
*/
public Set getManagedObjects(EnumSet<ObjectState> states)
{
- checkPM();
- return pm.getManagedObjects(states);
+ return getPM().getManagedObjects(states);
}
/*
@@ -386,8 +325,7 @@
*/
public Set getManagedObjects(Class... classes)
{
- checkPM();
- return pm.getManagedObjects(classes);
+ return getPM().getManagedObjects(classes);
}
/*
@@ -396,8 +334,7 @@
*/
public Set getManagedObjects(EnumSet<ObjectState> states, Class... classes)
{
- checkPM();
- return pm.getManagedObjects(states, classes);
+ return getPM().getManagedObjects(states, classes);
}
/*
@@ -406,8 +343,7 @@
*/
public boolean getMultithreaded()
{
- checkPM();
- return pm.getMultithreaded();
+ return getPM().getMultithreaded();
}
/*
@@ -416,8 +352,7 @@
*/
public Object getObjectById(Object id)
{
- checkPM();
- return pm.getObjectById(id);
+ return getPM().getObjectById(id);
}
/*
@@ -426,8 +361,7 @@
*/
public Object getObjectById(Object id, boolean validate)
{
- checkPM();
- return pm.getObjectById(id, validate);
+ return getPM().getObjectById(id, validate);
}
/*
@@ -436,8 +370,7 @@
*/
public <T> T getObjectById(Class<T> cls, Object key)
{
- checkPM();
- return (T)pm.getObjectById(cls, key);
+ return getPM().getObjectById(cls, key);
}
/*
@@ -446,8 +379,7 @@
*/
public Object getObjectId(Object pc)
{
- checkPM();
- return pm.getObjectId(pc);
+ return getPM().getObjectId(pc);
}
/*
@@ -456,8 +388,7 @@
*/
public Class getObjectIdClass(Class cls)
{
- checkPM();
- return pm.getObjectIdClass(cls);
+ return getPM().getObjectIdClass(cls);
}
/*
@@ -466,8 +397,7 @@
*/
public Collection getObjectsById(Collection oids)
{
- checkPM();
- return pm.getObjectsById(oids);
+ return getPM().getObjectsById(oids);
}
/*
@@ -476,8 +406,7 @@
*/
public Object[] getObjectsById(Object... oids)
{
- checkPM();
- return pm.getObjectsById(oids);
+ return getPM().getObjectsById(oids);
}
/*
@@ -486,8 +415,7 @@
*/
public Collection getObjectsById(Collection oids, boolean validate)
{
- checkPM();
- return pm.getObjectsById(oids, validate);
+ return getPM().getObjectsById(oids, validate);
}
/*
@@ -496,8 +424,7 @@
*/
public Object[] getObjectsById(Object[] oids, boolean validate)
{
- checkPM();
- return pm.getObjectsById(oids, validate);
+ return getPM().getObjectsById(validate, oids);
}
/*
@@ -506,8 +433,7 @@
*/
public Object[] getObjectsById(boolean validate, Object... oids)
{
- checkPM();
- return pm.getObjectsById(validate, oids);
+ return getPM().getObjectsById(validate, oids);
}
/*
@@ -516,8 +442,7 @@
*/
public PersistenceManagerFactory getPersistenceManagerFactory()
{
- checkPM();
- return pm.getPersistenceManagerFactory();
+ return getPM().getPersistenceManagerFactory();
}
/*
@@ -526,8 +451,7 @@
*/
public Sequence getSequence(String sequenceName)
{
- checkPM();
- return pm.getSequence(sequenceName);
+ return getPM().getSequence(sequenceName);
}
/*
@@ -536,8 +460,7 @@
*/
public Date getServerDate()
{
- checkPM();
- return pm.getServerDate();
+ return getPM().getServerDate();
}
/*
@@ -546,8 +469,7 @@
*/
public Object getTransactionalObjectId(Object pc)
{
- checkPM();
- return pm.getTransactionalObjectId(pc);
+ return getPM().getTransactionalObjectId(pc);
}
/*
@@ -556,8 +478,7 @@
*/
public Object getUserObject()
{
- checkPM();
- return pm.getUserObject();
+ return getPM().getUserObject();
}
/*
@@ -566,8 +487,7 @@
*/
public Object getUserObject(Object key)
{
- checkPM();
- return pm.getUserObject(key);
+ return getPM().getUserObject(key);
}
/*
@@ -576,8 +496,7 @@
*/
public boolean isClosed()
{
- checkPM();
- return pm.isClosed();
+ return getPM().isClosed();
}
/*
@@ -586,8 +505,7 @@
*/
public void makeNontransactional(Object pc)
{
- checkPM();
- pm.makeNontransactional(pc);
+ getPM().makeNontransactional(pc);
}
/*
@@ -596,8 +514,7 @@
*/
public void makeNontransactionalAll(Object... pcs)
{
- checkPM();
- pm.makeNontransactionalAll(pcs);
+ getPM().makeNontransactionalAll(pcs);
}
/*
@@ -606,8 +523,7 @@
*/
public void makeNontransactionalAll(Collection arg0)
{
- checkPM();
- pm.makeNontransactionalAll(arg0);
+ getPM().makeNontransactionalAll(arg0);
}
/*
@@ -616,8 +532,7 @@
*/
public <T> T makePersistent(T obj)
{
- checkPM();
- return (T)pm.makePersistent(obj);
+ return getPM().makePersistent(obj);
}
/*
@@ -626,8 +541,7 @@
*/
public <T> T[] makePersistentAll(T... arg0)
{
- checkPM();
- return (T[])pm.makePersistentAll(arg0);
+ return getPM().makePersistentAll(arg0);
}
/*
@@ -636,8 +550,7 @@
*/
public <T> Collection<T> makePersistentAll(Collection<T> arg0)
{
- checkPM();
- return pm.makePersistentAll(arg0);
+ return getPM().makePersistentAll(arg0);
}
/*
@@ -646,8 +559,7 @@
*/
public void makeTransactional(Object arg0)
{
- checkPM();
- pm.makeTransactional(arg0);
+ getPM().makeTransactional(arg0);
}
/*
@@ -656,8 +568,7 @@
*/
public void makeTransactionalAll(Object... arg0)
{
- checkPM();
- pm.makeTransactionalAll(arg0);
+ getPM().makeTransactionalAll(arg0);
}
/*
@@ -666,8 +577,7 @@
*/
public void makeTransactionalAll(Collection arg0)
{
- checkPM();
- pm.makeTransactionalAll(arg0);
+ getPM().makeTransactionalAll(arg0);
}
/*
@@ -676,8 +586,7 @@
*/
public void makeTransient(Object pc)
{
- checkPM();
- pm.makeTransient(pc);
+ getPM().makeTransient(pc);
}
/*
@@ -686,8 +595,7 @@
*/
public void makeTransient(Object pc, boolean useFetchPlan)
{
- checkPM();
- pm.makeTransient(pc, useFetchPlan);
+ getPM().makeTransient(pc, useFetchPlan);
}
/*
@@ -696,8 +604,7 @@
*/
public void makeTransientAll(Object... pcs)
{
- checkPM();
- pm.makeTransientAll(pcs);
+ getPM().makeTransientAll(pcs);
}
/*
@@ -706,8 +613,7 @@
*/
public void makeTransientAll(Collection pcs)
{
- checkPM();
- pm.makeTransientAll(pcs);
+ getPM().makeTransientAll(pcs);
}
/*
@@ -716,8 +622,7 @@
*/
public void makeTransientAll(Object[] pcs, boolean includeFetchPlan)
{
- checkPM();
- pm.makeTransientAll(pcs, includeFetchPlan);
+ getPM().makeTransientAll(includeFetchPlan, pcs);
}
/*
@@ -726,8 +631,7 @@
*/
public void makeTransientAll(boolean includeFetchPlan, Object... pcs)
{
- checkPM();
- pm.makeTransientAll(includeFetchPlan, pcs);
+ getPM().makeTransientAll(includeFetchPlan, pcs);
}
/*
@@ -736,8 +640,7 @@
*/
public void makeTransientAll(Collection pcs, boolean useFetchPlan)
{
- checkPM();
- pm.makeTransientAll(pcs, useFetchPlan);
+ getPM().makeTransientAll(pcs, useFetchPlan);
}
/*
@@ -746,8 +649,7 @@
*/
public <T> T newInstance(Class<T> pc)
{
- checkPM();
- return (T)pm.newInstance(pc);
+ return getPM().newInstance(pc);
}
/*
@@ -756,8 +658,7 @@
*/
public Query newNamedQuery(Class cls, String filter)
{
- checkPM();
- return pm.newQuery(cls, filter);
+ return getPM().newQuery(cls, filter);
}
/*
@@ -766,8 +667,7 @@
*/
public Object newObjectIdInstance(Class pcClass, Object key)
{
- checkPM();
- return pm.newObjectIdInstance(pcClass, key);
+ return getPM().newObjectIdInstance(pcClass, key);
}
/*
@@ -776,8 +676,7 @@
*/
public Query newQuery()
{
- checkPM();
- return pm.newQuery();
+ return getPM().newQuery();
}
/*
@@ -786,8 +685,7 @@
*/
public Query newQuery(Object obj)
{
- checkPM();
- return pm.newQuery(obj);
+ return getPM().newQuery(obj);
}
/*
@@ -796,8 +694,7 @@
*/
public Query newQuery(String query)
{
- checkPM();
- return pm.newQuery(query);
+ return getPM().newQuery(query);
}
/*
@@ -806,8 +703,7 @@
*/
public Query newQuery(Class cls)
{
- checkPM();
- return pm.newQuery(cls);
+ return getPM().newQuery(cls);
}
/*
@@ -816,8 +712,7 @@
*/
public Query newQuery(Extent cln)
{
- checkPM();
- return pm.newQuery(cln);
+ return getPM().newQuery(cln);
}
/*
@@ -826,8 +721,7 @@
*/
public Query newQuery(String language, Object query)
{
- checkPM();
- return pm.newQuery(language, query);
+ return getPM().newQuery(language, query);
}
/*
@@ -836,8 +730,7 @@
*/
public Query newQuery(Class cls, Collection cln)
{
- checkPM();
- return pm.newQuery(cls, cln);
+ return getPM().newQuery(cls, cln);
}
/*
@@ -846,8 +739,7 @@
*/
public Query newQuery(Class cls, String filter)
{
- checkPM();
- return pm.newQuery(cls, filter);
+ return getPM().newQuery(cls, filter);
}
/*
@@ -856,8 +748,7 @@
*/
public Query newQuery(Extent cln, String filter)
{
- checkPM();
- return pm.newQuery(cln, filter);
+ return getPM().newQuery(cln, filter);
}
/*
@@ -866,8 +757,7 @@
*/
public Query newQuery(Class cls, Collection cln, String filter)
{
- checkPM();
- return pm.newQuery(cls, cln, filter);
+ return getPM().newQuery(cls, cln, filter);
}
/*
@@ -876,8 +766,7 @@
*/
public Object putUserObject(Object key, Object value)
{
- checkPM();
- return pm.putUserObject(key, value);
+ return getPM().putUserObject(key, value);
}
/*
@@ -886,8 +775,7 @@
*/
public void refresh(Object obj)
{
- checkPM();
- pm.refresh(obj);
+ getPM().refresh(obj);
}
/*
@@ -896,8 +784,7 @@
*/
public void refreshAll()
{
- checkPM();
- pm.refreshAll();
+ getPM().refreshAll();
}
/*
@@ -906,8 +793,7 @@
*/
public void refreshAll(Object... pcs)
{
- checkPM();
- pm.refreshAll(pcs);
+ getPM().refreshAll(pcs);
}
/*
@@ -916,8 +802,7 @@
*/
public void refreshAll(Collection pcs)
{
- checkPM();
- pm.refreshAll(pcs);
+ getPM().refreshAll(pcs);
}
/*
@@ -926,8 +811,7 @@
*/
public void refreshAll(JDOException exc)
{
- checkPM();
- pm.refreshAll(exc);
+ getPM().refreshAll(exc);
}
/*
@@ -936,8 +820,7 @@
*/
public void removeInstanceLifecycleListener(InstanceLifecycleListener listener)
{
- checkPM();
- pm.removeInstanceLifecycleListener(listener);
+ getPM().removeInstanceLifecycleListener(listener);
}
/*
@@ -946,8 +829,7 @@
*/
public Object removeUserObject(Object key)
{
- checkPM();
- return pm.removeUserObject(key);
+ return getPM().removeUserObject(key);
}
/*
@@ -956,8 +838,7 @@
*/
public void retrieve(Object pc)
{
- checkPM();
- pm.retrieve(pc);
+ getPM().retrieve(pc);
}
/*
@@ -966,8 +847,7 @@
*/
public void retrieve(Object pc, boolean fgOnly)
{
- checkPM();
- pm.retrieve(pc, fgOnly);
+ getPM().retrieve(pc, fgOnly);
}
/*
@@ -976,8 +856,7 @@
*/
public void retrieveAll(Collection pcs)
{
- checkPM();
- pm.retrieveAll(pcs);
+ getPM().retrieveAll(pcs);
}
/*
@@ -986,8 +865,7 @@
*/
public void retrieveAll(Object... pcs)
{
- checkPM();
- pm.retrieveAll(pcs);
+ getPM().retrieveAll(pcs);
}
/*
@@ -996,8 +874,7 @@
*/
public void retrieveAll(Collection pcs, boolean fgOnly)
{
- checkPM();
- pm.retrieveAll(pcs, fgOnly);
+ getPM().retrieveAll(pcs, fgOnly);
}
/*
@@ -1006,8 +883,7 @@
*/
public void retrieveAll(Object[] pcs, boolean fgOnly)
{
- checkPM();
- pm.retrieveAll(pcs, fgOnly);
+ getPM().retrieveAll(fgOnly, pcs);
}
/*
@@ -1016,8 +892,7 @@
*/
public void retrieveAll(boolean fgOnly, Object... pcs)
{
- checkPM();
- pm.retrieveAll(fgOnly, pcs);
+ getPM().retrieveAll(fgOnly, pcs);
}
/*
@@ -1026,8 +901,7 @@
*/
public void setCopyOnAttach(boolean flag)
{
- checkPM();
- pm.setCopyOnAttach(flag);
+ getPM().setCopyOnAttach(flag);
}
/*
@@ -1036,8 +910,7 @@
*/
public void setDetachAllOnCommit(boolean flag)
{
- checkPM();
- pm.setDetachAllOnCommit(flag);
+ getPM().setDetachAllOnCommit(flag);
}
/*
@@ -1046,8 +919,7 @@
*/
public void setIgnoreCache(boolean flag)
{
- checkPM();
- pm.setIgnoreCache(flag);
+ getPM().setIgnoreCache(flag);
}
/*
@@ -1056,8 +928,7 @@
*/
public void setMultithreaded(boolean flag)
{
- checkPM();
- pm.setMultithreaded(flag);
+ getPM().setMultithreaded(flag);
}
/*
@@ -1066,7 +937,6 @@
*/
public void setUserObject(Object userObject)
{
- checkPM();
- pm.setUserObject(userObject);
+ getPM().setUserObject(userObject);
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|