Miscellaneous cleanups.

diff --git a/examples/SunClassLoader.java b/examples/SunClassLoader.java
index 49b8117c96fb7756806e3afcc24c619d59d816e8..88aa81e84ee101d5d4379a2436c715e6df3b05ee 100644 (file)
--- a/examples/SunClassLoader.java
+++ b/examples/SunClassLoader.java
@@ -33,10 +33,10 @@ public class SunClassLoader extends ClassLoader implements Opcodes {
 
     protected final Map<String,Class> knownClasses = new HashMap<String,Class>();
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         SunClassLoader sun = new SunClassLoader();
         sun.loadMagic();
         
-        //Class cls = sun.loadClass("java/lang/Object");
+        Class cls2 = sun.loadClass("java/lang/Object");
     }
 }

diff --git a/jpf.properties b/jpf.properties
index 8942678621075358076c951d93d9c4ceb0cebc50..0bdb03646b526e87e533ffc9acc5bac78e939397 100644 (file)
--- a/jpf.properties
+++ b/jpf.properties
@@ -22,7 +22,6 @@ jpf-core.native_classpath=\
 
 jpf-core.classpath=\
   ${jpf-core}/build/jpf-classes.jar;\
-  ${jpf-core}/build/asm-7.1.jar;\
   ${jpf-core}/build/examples
 
 jpf-core.sourcepath=\

diff --git a/run.sh b/run.sh
index b075cb6a7b4e528cf5712abc9b0f2006708598de..63bf991d00785890dce711723ce503574ee4518a 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-#java -classpath build/jpf.jar gov.nasa.jpf.JPF +classpath=examples:examples/groovy-2.5.7:../smartthings-infrastructure/bin/main/ +listener=.listener.EventConflictTracker $1
-java -classpath build/jpf.jar gov.nasa.jpf.JPF +classpath=examples:examples/groovy-2.5.7:../smartthings-infrastructure/bin/main/ $1
+java -classpath build/jpf.jar gov.nasa.jpf.JPF +classpath=examples:examples/groovy-2.5.7:../smartthings-infrastructure/bin/main/ +listener=.listener.VariableConflictTracker $1
+#java -classpath build/jpf.jar gov.nasa.jpf.JPF +classpath=examples:examples/groovy-2.5.7:../smartthings-infrastructure/bin/main/ $1
 #java -Xmx1024m -classpath build/jpf.jar gov.nasa.jpf.JPF +classpath=examples:examples/groovy-2.5.7:../smartthings-infrastructure/bin/main/ $1

diff --git a/src/peers/gov/nasa/jpf/vm/JPF_java_lang_ClassLoader.java b/src/peers/gov/nasa/jpf/vm/JPF_java_lang_ClassLoader.java
index cfea25c6ae1db7995ba1247ae0ee44086e013943..8ae85fbf150ea214ff9a26bf1b1e61cd86d11345 100644 (file)
--- a/src/peers/gov/nasa/jpf/vm/JPF_java_lang_ClassLoader.java
+++ b/src/peers/gov/nasa/jpf/vm/JPF_java_lang_ClassLoader.java
@@ -224,7 +224,6 @@ public class JPF_java_lang_ClassLoader extends NativePeer {
     }
 
     if((name.indexOf('/') != -1) || (name.charAt(0) == '[')) {
-      //env.throwException("java.lang.ClassNotFoundException", "IllegalName: " + name);
       env.throwException("java.lang.NoClassDefFoundError", "IllegalName: " + name);
     }
   }