Skip to content

Fix class loading order to support any extension #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mahmoud-Khawaja wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix class loading order to support any extension #587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions src/main/gov/nasa/jpf/jvm/JVMSystemClassLoaderInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,49 @@ protected void addSystemBootClassPath () {

/**
* this is the main method to create the ClassPath, which is called from the ctor
*
* Search order (first match wins):
* 1. Extension boot classpaths (any *.boot_classpath property except vm.boot_classpath)
* - this allows extensions to override jpf-core model classes
* 2. Explicit classpath entries (from 'classpath' property)
* 3. jpf-core's vm.boot_classpath
* 4. JRE runtime classes (handled by JRTClassFileContainer in getMatch)
*/
@Override
protected void initializeSystemClassPath (VM vm, int appId) {
Config conf = vm.getConfig();
File[] pathElements;

// explicit "classpath[.id]" settings have precedence
// first, load all extension boot classpaths (any property ending in .boot_classpath
// other than vm.boot_classpath) so extensions can override jpf-core model classes
for (Object keyObj : conf.keySet()) {
String key = keyObj.toString();
if (key.endsWith(".boot_classpath") && !key.equals("vm.boot_classpath")) {
String[] bootPaths = conf.getStringArray(key);
if (bootPaths != null) {
for (String bp : bootPaths) {
bp = bp.trim();
if (bp.length() > 0 && !bp.equals("<system>")) {
File f = new File(bp);
if (f.exists()) {
addClassPathElement(f.getAbsolutePath());
log.info("added extension boot classpath (", key, "): ", f.getAbsolutePath());
}
}
}
}
}
}

// explicit "classpath[.id]" settings
pathElements = getPathElements(conf, "classpath", appId);
if (pathElements != null) {
for (File f : pathElements) {
addClassPathElement(f.getAbsolutePath());
}
}

// we optionally append boot_classpath
// we optionally append vm.boot_classpath (jpf-core's boot classpath)
pathElements = getPathElements(conf, "vm.boot_classpath", appId);
if (pathElements != null) {
for (File f : pathElements) {
Expand Down
Loading