Skip to content

Commit e373873

Browse files
committed
fix some stupid classpath things
1 parent ac179a1 commit e373873

4 files changed

Lines changed: 8 additions & 219 deletions

File tree

Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/MethodInterceptor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
public class MethodInterceptor {
1414
public static Object invoke(Method method, Object obj, Object... args)
1515
throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
16+
method.setAccessible(true);
17+
1618
if (NonDeterministicLoggingMethodVisitor.isND(
1719
method.getDeclaringClass().getName().replace(".", "/"), method.getName(),
1820
Type.getMethodDescriptor(method))) {

Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingClassVisitor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public class NonDeterministicLoggingClassVisitor extends ClassVisitor implements
3737
static {
3838
Scanner s;
3939
try {
40-
s = new Scanner(NonDeterministicLoggingClassVisitor.class.getClassLoader()
41-
.getResourceAsStream("listenerMethods.txt"));
40+
s = new Scanner(NonDeterministicLoggingClassVisitor.class
41+
.getResourceAsStream("/listenerMethods.txt"));
4242
while (s.hasNextLine()) {
4343
String l = s.nextLine();
4444
callbackMethods.add(l);

Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingMethodVisitor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public static void registerNDMethod(String owner, String name, String desc) {
5454
static {
5555
Scanner s;
5656
try {
57-
s = new Scanner(NonDeterministicReplayMethodVisitor.class.getClassLoader()
58-
.getResourceAsStream("nondeterministic-methods.txt"));
57+
s = new Scanner(NonDeterministicReplayMethodVisitor.class
58+
.getResourceAsStream("/nondeterministic-methods.txt"));
5959
while (s.hasNextLine())
6060
nonDeterministicMethods.add(s.nextLine());
6161
if (Instrumenter.IS_DACAPO) {
62-
s = new Scanner(NonDeterministicLoggingMethodVisitor.class.getClassLoader()
63-
.getResourceAsStream("nd-geronimo-ignored"));
62+
s = new Scanner(NonDeterministicLoggingMethodVisitor.class
63+
.getResourceAsStream("/nd-geronimo-ignored"));
6464
while (s.hasNextLine())
6565
nonDeterministicMethods.remove(s.nextLine());
6666
}

0 commit comments

Comments
 (0)