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

Revert 'OPENJPA-758: Added code to check the ClassResolver to get a class loader when attempting to load a ValueHandler or FieldStrategy.' rev-1155104 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.0.x@1176528 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jody Grassel 2011-09-27 19:04:12 +00:00
parent 43117f9e4d
commit 7770243a21
2 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
View File

@ -942,7 +942,7 @@ public class MappingRepository
try { try {
Class c = JavaTypes.classForName(name, val, Class c = JavaTypes.classForName(name, val,
(ClassLoader) AccessController.doPrivileged( (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(FieldStrategy.class)),false); J2DoPrivHelper.getClassLoaderAction(FieldStrategy.class)));
Object o = AccessController.doPrivileged( Object o = AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c)); J2DoPrivHelper.newInstanceAction(c));
Configurations.configureInstance(o, getConfiguration(), props); Configurations.configureInstance(o, getConfiguration(), props);
@ -969,7 +969,7 @@ public class MappingRepository
try { try {
Class c = JavaTypes.classForName(name, val, Class c = JavaTypes.classForName(name, val,
(ClassLoader) AccessController.doPrivileged( (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(ValueHandler.class)),false); J2DoPrivHelper.getClassLoaderAction(ValueHandler.class)));
if (ValueHandler.class.isAssignableFrom(c)) { if (ValueHandler.class.isAssignableFrom(c)) {
ValueHandler vh = (ValueHandler) AccessController.doPrivileged( ValueHandler vh = (ValueHandler) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c)); J2DoPrivHelper.newInstanceAction(c));

40
openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java
View File

@ -196,38 +196,12 @@ public class JavaTypes {
context.getFieldMetaData().getDeclaringType(), context, loader); context.getFieldMetaData().getDeclaringType(), context, loader);
} }
/**
* Try to load a class using the provided loader. Optionally tries the
* configuration's ClassResolver if the supplied loader cannot find the class.
*
* @param name Name of the class to load.
* @param context
* @param loader ClassLoader to use. If null, the configuration's ClassResolver will be used.
* @param mustExist Whether the supplied loader <b>must</b> be able to load the class. If true no attempt to use a
* different classloader will be made. If false the ClassResolver from the configuration will be used.
*/
public static Class classForName(String name, ValueMetaData context,
ClassLoader loader, boolean mustExist) {
return classForName(name,
context.getFieldMetaData().getDefiningMetaData(),
context.getFieldMetaData().getDeclaringType(), context, loader, mustExist);
}
/**
* OJ-758: Delegates to the final classForName. This is needed
* to maintain the existing code path prior to OJ-758.
*/
private static Class classForName(String name, ClassMetaData meta,
Class dec, ValueMetaData vmd, ClassLoader loader) {
return classForName(name, meta, dec, vmd, loader, true);
}
/** /**
* Check the given name against the same set of standard packages used * Check the given name against the same set of standard packages used
* when parsing metadata. * when parsing metadata.
*/ */
private static Class classForName(String name, ClassMetaData meta, private static Class classForName(String name, ClassMetaData meta,
Class dec, ValueMetaData vmd, ClassLoader loader, boolean mustExist) { Class dec, ValueMetaData vmd, ClassLoader loader) {
// special case for PersistenceCapable and Object // special case for PersistenceCapable and Object
if ("PersistenceCapable".equals(name) if ("PersistenceCapable".equals(name)
|| "javax.jdo.PersistenceCapable".equals(name)) // backwards compat || "javax.jdo.PersistenceCapable".equals(name)) // backwards compat
@ -249,21 +223,9 @@ public class JavaTypes {
pkg = Strings.getPackageName(vmd.getDeclaredType()); pkg = Strings.getPackageName(vmd.getDeclaredType());
cls = CFMetaDataParser.classForName(name, pkg, runtime, loader); cls = CFMetaDataParser.classForName(name, pkg, runtime, loader);
} }
//OJ-758 start: If the class is still null, as a last/final attempt to
//load the class, check with the ClassResolver to get a loader
//and use it to attempt to load the class.
if (cls == null && !mustExist){
loader = rep.getConfiguration().getClassResolverInstance().
getClassLoader(dec, meta.getEnvClassLoader());
cls = CFMetaDataParser.classForName(name, pkg, runtime, loader);
}
//OJ-758 end
if (cls == null) if (cls == null)
throw new MetaDataException(_loc.get("bad-class", name, throw new MetaDataException(_loc.get("bad-class", name,
(vmd == null) ? (Object) meta : (Object) vmd)); (vmd == null) ? (Object) meta : (Object) vmd));
return cls; return cls;
} }