boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

fix for class loading problem

Browse Source 
see also http://forum.yacy-websuche.de/viewtopic.php?p=12153#p12153

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5505 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 16 years ago
parent 78778df464
commit 335d6ce8fc
2 changed files with 21 additions and 93 deletions
Show Stats Download Patch File Download Diff File

5
source/de/anomic/http/httpdFileHandler.java
Unescape View File

@ -1149,7 +1149,6 @@ public final class httpdFileHandler {
} else { } else {
return m; return m;
} }
} }
} }
@ -1185,10 +1184,6 @@ public final class httpdFileHandler {
return result; return result;
} }
// public void doConnect(Properties conProp, httpHeader requestHeader, InputStream clientIn, OutputStream clientOut) {
// throw new UnsupportedOperationException();
// }
/** /**
* Tells if a filename ends with a suffix from a given list. * Tells if a filename ends with a suffix from a given list.
* @param filename the filename * @param filename the filename

109
source/de/anomic/server/serverClassLoader.java
Unescape View File

@ -25,14 +25,10 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import de.anomic.server.logging.serverLog;
public final class serverClassLoader extends ClassLoader { public final class serverClassLoader extends ClassLoader {
/** /**
* directory of class files * directory of class files
*/ */
private static final String HTROOT = "htroot" + File.separator;
private final static String baseDir = System.getProperty("user.dir");
private final HashMap<File, Class<?>> classes; private final HashMap<File, Class<?>> classes;
public serverClassLoader() { public serverClassLoader() {
@ -51,93 +47,30 @@ public final class serverClassLoader extends ClassLoader {
} }
public Class<?> loadClass(final File classfile) throws ClassNotFoundException { public Class<?> loadClass(final File classfile) throws ClassNotFoundException {
// we consider that the classkey can either be only the name of a class, or a partial or // take the class out of the cache, denoted by the class file
// complete path to a class file Class<?> c = this.classes.get(classfile);
if (c != null) return c;
// normalize classkey: strip off '.class'
//if (classkey.endsWith(".class")) classkey = classkey.substring(0, classkey.length() - 6);
String classFileName = null; final int p = classfile.getName().indexOf(".");
try { if (p < 0) throw new ClassNotFoundException("wrong class name: " + classfile.getName());
classFileName = classfile.getCanonicalPath(); final String classname = classfile.getName().substring(0, p);
} catch (final IOException e) {
throw new ClassNotFoundException("Unable to resolve the classfile path");
}
// try to load the class
synchronized(classFileName.intern()) {
// first try: take the class out of the cache, denoted by the classname
Class<?> c = this.classes.get(classfile);
if (c != null) return c;
// consider classkey as a file and extract the file name
//File classfile = new File(classkey);
// this file cannot exist for real, since we stripped off the .class
// we constructed the classfile for the only purpose to strip off the name:
/* get the class name out of the classfile */
// make classFileName relative
classFileName = classFileName.substring(classFileName.indexOf(baseDir) + baseDir.length());
// special source dirs
if(classFileName.contains(HTROOT)) {
classFileName = classFileName.substring(classFileName.indexOf(HTROOT) + HTROOT.length());
}
String packge = "";
final int endPackage = classFileName.lastIndexOf(File.separatorChar);
if(endPackage != -1) {
packge = classFileName.substring(0, endPackage);
// the files under htroot/yacy are all in 'default package'!
if(packge.startsWith("yacy")) {
packge = "";
}
if(packge.length() > 0) {
packge = packge.replace(File.separatorChar, '.');
packge += ".";
}
}
final int p = classFileName.indexOf(".", endPackage);
final String classname = packge + classFileName.substring(endPackage + 1, p);
// now that we have the name, we can create the real class file
//classfile = new File(classkey + ".class");
// This code doesn't work properly if there are multiple classes with the same name // load the file from the file system
// This is because we havn't definded package names in our servlets byte[] b;
// try {
// try { b = serverFileUtils.read(classfile);
// c = findLoadedClass(classname); // make a class out of the stream
// if (c == null) { c = this.defineClass(null, b, 0, b.length);
// // second try: ask the system resolveClass(c);
// c = findSystemClass(classname); this.classes.put(classfile, c);
// } } catch (final LinkageError ee) {
// if (c == null) { c = findLoadedClass(classname);
// // third try if (c != null) return c;
// throw new ClassNotFoundException("internal trigger"); throw new ClassNotFoundException(classfile.toString());
// } } catch (final IOException ee) {
// } catch (ClassNotFoundException e) { throw new ClassNotFoundException(classfile.toString());
//System.out.println("INTERNAL ERROR1 in cachedClassLoader: " + e.getMessage());
// third try: load the file from the file system
byte[] b;
try {
b = serverFileUtils.read(classfile);
// now make a class out of the stream
// System.out.println("loading class " + classname + " from file " + classfile.toString());
c = this.defineClass(null, b, 0, b.length);
resolveClass(c);
this.classes.put(classfile, c);
} catch (final LinkageError ee) {
c = findLoadedClass(classname);
if (c!=null) return c;
serverLog.logSevere("ClassLoader", "class "+ classname +" not defined: "+ ee);
} catch (final IOException ee) {
//System.out.println("INTERNAL ERROR2 in cachedClassLoader: " + ee.getMessage());
throw new ClassNotFoundException(classfile.toString());
}
// }
return c;
} }
return c;
} }
} }
Write Preview
Loading…
Cancel
Save