From: rtrimana <rtrimana@uci.edu>
Date: Thu, 18 Jul 2019 00:00:12 +0000 (-0700)
Subject: Miscellaneous cleanups.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6fa863f56759424d42aacba14b5261db8bffad59;p=jpf-core.git

Miscellaneous cleanups.
---

diff --git a/examples/SunClassLoader.java b/examples/SunClassLoader.java
index 49b8117..88aa81e 100644
--- 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 8942678..0bdb036 100644
--- 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 b075cb6..63bf991 100755
--- 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 cfea25c..8ae85fb 100644
--- 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);
     }
   }