backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

Handle different versions of a class in the library path

Browse Source
This commit is contained in:
Volker Berlin 2020-12-12 20:42:46 +01:00
parent 2c0db289cd
commit 26ec7ece48
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/de/inetsoftware/jwebassembly/module/ClassFileLoader.java
View File

@ -24,7 +24,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import de.inetsoftware.classparser.ClassFile; import de.inetsoftware.classparser.ClassFile;
import de.inetsoftware.classparser.WeakValueCache;
/** /**
* Cache and manager for the loaded ClassFiles * Cache and manager for the loaded ClassFiles
@ -35,7 +34,8 @@ public class ClassFileLoader {
private final HashMap<String, ClassFile> replace = new HashMap<>(); private final HashMap<String, ClassFile> replace = new HashMap<>();
private final WeakValueCache<String, ClassFile> weakCache = new WeakValueCache<>(); //A weak cache has produce problems if there are different versions of the same class in the build path and/or library path. Then the prescan can add the second version of the class.
private final HashMap<String, ClassFile> cache = new HashMap<>();
private final ClassLoader loader; private final ClassLoader loader;
@ -75,14 +75,14 @@ public class ClassFileLoader {
if( classFile != null ) { if( classFile != null ) {
return classFile; return classFile;
} }
classFile = weakCache.get( className ); classFile = cache.get( className );
if( classFile != null ) { if( classFile != null ) {
return classFile; return classFile;
} }
InputStream stream = loader.getResourceAsStream( className + ".class" ); InputStream stream = loader.getResourceAsStream( className + ".class" );
if( stream != null ) { if( stream != null ) {
classFile = new ClassFile( stream ); classFile = new ClassFile( stream );
weakCache.put( className, classFile ); cache.put( className, classFile );
} }
return classFile; return classFile;
} }
@ -97,9 +97,15 @@ public class ClassFileLoader {
String name = classFile.getThisClass().getName(); String name = classFile.getThisClass().getName();
if( bootLoader.getResource( name + ".class" ) != null ) { if( bootLoader.getResource( name + ".class" ) != null ) {
// if the same resource is exist in the JVM self then we need to hold the reference permanently // if the same resource is exist in the JVM self then we need to hold the reference permanently
replace.put( name, classFile ); if( replace.get( name ) == null ) {
// does not add a second version of the same file
replace.put( name, classFile );
}
} else { } else {
weakCache.put( name, classFile ); if( cache.get( name ) == null ) {
// does not add a second version of the same file
cache.put( name, classFile );
}
} }
} }

2
src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java
View File

@ -166,7 +166,7 @@ public class ModuleGenerator {
* @throws IOException * @throws IOException
* if any I/O error occur * if any I/O error occur
*/ */
public void prepare( ClassFile classFile ) throws IOException { public void prepare( @Nonnull ClassFile classFile ) throws IOException {
classFileLoader.cache( classFile ); classFileLoader.cache( classFile );
// check if this class replace another class // check if this class replace another class
Map<String,Object> annotationValues; Map<String,Object> annotationValues;