Stabilized InputStream handling. There seem to be many flavors of ZIP…

… files.

src/main/scala/de/upb/cs/swt/delphi/crawler/tools/ClassStreamReader.scala

@@ -35,17 +35,15 @@ trait ClassStreamReader {
 
     while (je != null) {
       val entryName = je.getName
-      if (je.getSize.toInt > 0 && entryName.endsWith(".class")) {
-        val entryBytes = new Array[Byte](je.getSize.toInt)
+      if (entryName.endsWith(".class")) {
+        val baos = new ByteArrayOutputStream()
 
-        var remaining = entryBytes.length
-        var offset = 0
-        while (remaining > 0) {
-          val readBytes = in.read(entryBytes, offset, remaining)
-          if (readBytes < 0) throw new EOFException()
-          remaining -= readBytes
-          offset += readBytes
+        Stream.continually(in.read()).takeWhile(_ != -1).foreach { x =>
+          baos.write(x)
         }
+
+        val entryBytes = baos.toByteArray
+
         futures ::= Future[List[(ClassFile, String)]] {
           val cfs = reader.ClassFile(new DataInputStream(new ByteArrayInputStream(entryBytes)))
           cfs map { cf => (cf, entryName) }
@@ -54,7 +52,9 @@ trait ClassStreamReader {
       je = in.getNextJarEntry()
     }
 
-    futures.flatMap(f => Await.result(f, Duration.Inf))
+    val result = futures.flatMap(f => Await.result(f, Duration.Inf))
+
+    result
   }
 
   /**
@@ -67,11 +67,12 @@ trait ClassStreamReader {
     val config : Config = org.opalj.br.BaseConfig
 
     val projectClasses: Traversable[(ClassFile, URL)] = readClassFiles(jarInputStream).map { case (classFile, _) => (classFile, source) }
-    val libraryClasses: Traversable[(ClassFile, URL)] =
+    val libraryClasses: Traversable[(ClassFile, URL)] = Nil
+    /*
       readClassFiles(new JarInputStream
                             (new FileInputStream(org.opalj.bytecode.RTJar)), Project.JavaLibraryClassFileReader)
         .map{ case (classFile, _) => (classFile, org.opalj.bytecode.RTJar.toURI.toURL) }
-
+    */
 
     Project(projectClasses, libraryClasses, true, Traversable.empty)(config, OPALLogAdapter)
   }

src/test/scala/de/upb/cs/swt/delphi/crawler/tools/ClassStreamReaderTest.scala

@@ -71,4 +71,18 @@ class ClassStreamReaderTest extends FlatSpec with Matchers with BeforeAndAfter {
     p.projectClassFilesCount should be (23)
     p.allMethodsWithBody.size should not be (0)
   }
+
+  it should "be able to construct classes out of a somewhat broken JAR file" in {
+    val target = File("src/test/resources/xsddoc-0.8.jar")
+    val fis = target.inputStream()
+
+
+    val jis = new JarInputStream(fis)
+
+    val p = new ClassStreamReader {}.createProject(target.toURL, jis)
+
+    p shouldBe a [Project[_]]
+    p.projectClassFilesCount should be (21)
+    p.allMethodsWithBody.size should not be (0)
+  }
 }