--- a/JavaClassReader.st	Tue May 21 00:17:00 2013 +0100
+++ b/JavaClassReader.st	Tue May 21 13:04:40 2013 +0100
@@ -468,7 +468,7 @@
                     read := [
                             nm := clsName , '.class'.
 
-                            (zar isValidPath: nm) ifTrue: [
+                            (zar isValidFile: nm) ifTrue: [
                                 (Java isExcludedFromClassPath: nm) ifFalse: [
                                     JavaVM commonOpenStreamUsing:[ zar := zar reopenForReading ].
                                     entry := zar extract: nm.

--- a/benchmarks/benchmark-runner.sh	Tue May 21 00:17:00 2013 +0100
+++ b/benchmarks/benchmark-runner.sh	Tue May 21 13:04:40 2013 +0100
@@ -21,7 +21,7 @@
     shift
     #PROFILER="/usr/local/bin/valgrind -v -v -d --tool=callgrind --instr-atstart=no"
     PROFILER="/usr/local/bin/valgrind -v --smc-check=all-non-file --tool=callgrind --instr-atstart=no"
-    PROFILER="valgrind -v --smc-check=all-non-file --tool=callgrind --instr-atstart=no"
+    PROFILER="valgrind -v --smc-check=all-non-file --tool=callgrind --instr-atstart=no --branch-sim=yes --cache-sim=yes --collect-jumps=yes"
     #PROFILER_OPTS=--callgrind
 fi
 

--- a/extensions.st	Tue May 21 00:17:00 2013 +0100
+++ b/extensions.st	Tue May 21 13:04:40 2013 +0100
@@ -2157,6 +2157,17 @@
     "Created: / 04-12-2011 / 11:24:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!ZipArchive methodsFor:'queries - java support'!
+
+isValidFile: path
+    "Return true, if the recevier contains given file. false otherwise.
+    "
+    ^zipMembersByName includesKey: path
+
+    "Created: / 20-05-2013 / 23:37:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+
+! !
+
 !ZipArchive methodsFor:'reading - java support'!
 
 nextBytes: bytesToRead of: zmember startingAt: pos into: b startingAt: off