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

OPENJPA-477 no need to make changes to BootStrap, StateManagerImpl and PersistenceProviderImpl. 

These files are restored to their previous version.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@615806 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Catalina Wei 2008-01-28 09:36:42 +00:00
parent 37c4e9148a
commit b2a10e285f
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java
View File

@ -39,7 +39,7 @@ import org.apache.openjpa.util.UserException;
*/ */
public class Bootstrap { public class Bootstrap {
protected static final Class[] FACTORY_ARGS = private static final Class[] FACTORY_ARGS =
new Class[]{ ConfigurationProvider.class }; new Class[]{ ConfigurationProvider.class };
private static Localizer s_loc = Localizer.forPackage(Bootstrap.class); private static Localizer s_loc = Localizer.forPackage(Bootstrap.class);
@ -124,7 +124,7 @@ public class Bootstrap {
return (BrokerFactory) meth.invoke(null, new Object[]{ conf }); return (BrokerFactory) meth.invoke(null, new Object[]{ conf });
} }
protected static String getFactoryClassName(ConfigurationProvider conf, private static String getFactoryClassName(ConfigurationProvider conf,
ClassLoader loader) { ClassLoader loader) {
try { try {
return getFactoryClass(conf, loader).getName(); return getFactoryClass(conf, loader).getName();

2
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
View File

@ -3001,7 +3001,7 @@ public class StateManagerImpl
/** /**
* Mark the field as loaded or unloaded. * Mark the field as loaded or unloaded.
*/ */
public void setLoaded(int field, boolean isLoaded) { private void setLoaded(int field, boolean isLoaded) {
// don't continue if loaded state is already correct; otherwise we // don't continue if loaded state is already correct; otherwise we
// can end up clearing _fieldImpl when we shouldn't // can end up clearing _fieldImpl when we shouldn't
if (_loaded.get(field) == isLoaded) if (_loaded.get(field) == isLoaded)

17
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
View File

@ -99,7 +99,7 @@ public class PersistenceProviderImpl
} }
if (poolValue == null || !((Boolean) poolValue).booleanValue()) if (poolValue == null || !((Boolean) poolValue).booleanValue())
return newBrokerFactory(cp, loader); return Bootstrap.newBrokerFactory(cp, loader);
else else
return Bootstrap.getBrokerFactory(cp, loader); return Bootstrap.getBrokerFactory(cp, loader);
} }
@ -199,19 +199,4 @@ public class PersistenceProviderImpl
return _trans.transform(cl, name, previousVersion, pd, bytes); return _trans.transform(cl, name, previousVersion, pd, bytes);
} }
} }
/**
* Return a persistence product deviration with default setting.
*/
public PersistenceProductDerivation newPersistenceProductDerivation() {
return new PersistenceProductDerivation();
}
/**
* Return a broker factory for the given configuration and class loader.
*/
public BrokerFactory newBrokerFactory(ConfigurationProvider cp,
ClassLoader loader) {
return Bootstrap.newBrokerFactory(cp, loader);
}
} }