PATCH [6901992] : Possible InvalidJarIndexException due to bug in sun.misc.JarIndex.merge() (original) (raw)

Sat Jun 16 04:20:51 UTC 2012

   // add the mapping to jarMap
   addToList(jarName, packageName, jarMap);
   addMapping(packageName, jarName);
* last index of '/'. It just adds the filename.
* last index of '/'. It just adds the jarItem (filename or package)
* as it is received.
*/
   addToList(fileName, jarName, indexMap);
   addToList(jarItem, jarName, indexMap);

   // add the mapping to jarMap
   addToList(jarName, fileName, jarMap);
   addToList(jarName, jarItem, jarMap);
}
           if (!metaInfFilenames) {
           if (!metaInfFilenames || !fileName.startsWith("META-INF/")) {
               add(fileName, currentJar);
           } else {
               if (!fileName.startsWith("META-INF/")) {
                   add(fileName, currentJar);
               } else if (!entry.isDirectory()) {
           } else if (!entry.isDirectory()) {
                   // Add files under META-INF explicitly so that certain
                   // services, like ServiceLoader, etc, can be located
                   // with greater accuracy. Directories can be skipped
                   // since each file will be added explicitly.
                   addExplicit(fileName, currentJar);
               }
                   addMapping(fileName, currentJar);
           }
       }
           addToList(name, currentJar, indexMap);
           addToList(currentJar, name, jarMap);
           addMapping(name, currentJar);
       }
   }
           toIndex.add(packageName, jarName);
           toIndex.addMapping(packageName, jarName);
       }
   }
    Test URLClassLoader usage of the merge method when using indexes
   String javaHome = System.getProperty("java.home");
   if (javaHome.endsWith("jre")) {
       int index = javaHome.lastIndexOf(slash);
       if (index != -1)
           javaHome = javaHome.substring(0, index);
   }
   jar = javaHome + slash + "bin" + slash + "jar";
   // Create the jars file
   File jar1 = buildJar1();
   File jar2 = buildJar2();
   File jar3 = buildJar3();
   // Index jar files in two levels: jar1 -> jar2 -> jar3
   createIndex(jar2.getName(), jar3.getName());
   createIndex(jar1.getName(), jar2.getName());
   // Get root jar of the URLClassLoader
   URL url = jar1.toURI().toURL();
   URLClassLoader classLoader = new URLClassLoader(new URL[] { url });
   assertResource(classLoader, "com/jar1/resource.file", "jar1");
   assertResource(classLoader, "com/test/resource1.file", "resource1");
   assertResource(classLoader, "com/jar2/resource.file", "jar2");
   assertResource(classLoader, "com/test/resource2.file", "resource2");
   assertResource(classLoader, "com/test/resource3.file", "resource3");
   /*
    * The following two asserts failed before the fix of the bug 6901992
    */
   // Check that an existing file is found using the merged index
   assertResource(classLoader, "com/missing/jar3/resource.file", "jar3");
   // Check that a non existent file in directory which does not contain
   // any file is not found and it does not throw InvalidJarIndexException
   assertResource(classLoader, "com/missing/nofile", null);
   JarBuilder jar3Builder = new JarBuilder(tmpFolder, "jar3.jar");
   jar3Builder.addResourceFile("com/test/resource3.file", "resource3");
   jar3Builder.addResourceFile("com/missing/jar3/resource.file", "jar3");
   return jar3Builder.build();
   JarBuilder jar2Builder = new JarBuilder(tmpFolder, "jar2.jar");
   jar2Builder.addResourceFile("com/jar2/resource.file", "jar2");
   jar2Builder.addResourceFile("com/test/resource2.file", "resource2");
   return jar2Builder.build();
   JarBuilder jar1Builder = new JarBuilder(tmpFolder, "jar1.jar");
   jar1Builder.addResourceFile("com/jar1/resource.file", "jar1");
   jar1Builder.addResourceFile("com/test/resource1.file", "resource1");
   return jar1Builder.build();
   // ProcessBuilder is used so that the current directory can be set
   // to the directory that directly contains the jars.
   debug("Running jar to create the index for: " + parentJar + " and "
           + childJar);
   ProcessBuilder pb = new ProcessBuilder(jar, "-i", parentJar, childJar);
   pb.directory(tmpFolder);
   // pd.inheritIO();
   try {
       Process p = pb.start();
       if (p.waitFor() != 0)
           throw new RuntimeException("jar indexing failed");
       if (debug && p != null) {
           debugStream(p.getInputStream());
           debugStream(p.getErrorStream());
       }
   } catch (InterruptedException ie) {
       throw new RuntimeException(ie);
   } catch (IOException e) {
       throw new RuntimeException(e);
   }
   BufferedReader reader = new BufferedReader(new InputStreamReader(is));
   String line;
   while ((line = reader.readLine()) != null) {
       debug(line);
   }
   reader.close();
       String expectedContent) throws IOException {
   InputStream fileStream = classLoader.getResourceAsStream(file);
   if (fileStream == null && expectedContent == null) {
       return;
   }
   if (fileStream == null && expectedContent != null) {
       throw new RuntimeException(
               buildMessage(file, expectedContent, null));
   }
   try {
       String actualContent = readAsString(fileStream);
       if (fileStream != null && expectedContent == null) {
           throw new RuntimeException(buildMessage(file, null,
                   actualContent));
       }
       if (!expectedContent.equals(actualContent)) {
           throw new RuntimeException(buildMessage(file, expectedContent,
                   actualContent));
       }
   } finally {
       fileStream.close();
   }
       String actualContent) {
   return "Expected: " + expectedContent + " for: " + file + " was: "
           + actualContent;
       throws IOException {
   byte[] buffer = new byte[1000];
   int count = fileStream.read(buffer);
   return new String(buffer, 0, count, "ASCII");
   if (debug) {
       System.out.println(message);
   }
* Helper class for building jar files
*/
   private JarOutputStream os;
   private File jarFile;
   public JarBuilder(File tmpFolder, String jarName)
           throws FileNotFoundException, IOException {
       this.jarFile = new File(tmpFolder, jarName);
       this.os = new JarOutputStream(new FileOutputStream(jarFile));
   }
   public void addResourceFile(String pathFromRoot, String content)
           throws IOException {
       JarEntry entry = new JarEntry(pathFromRoot);
       os.putNextEntry(entry);
       os.write(content.getBytes("ASCII"));
       os.closeEntry();
   }
   public File build() throws IOException {
       os.close();
       return jarFile;
  jar1.getAbsolutePath());
  jar2.getAbsolutePath());
   String jarName) {
  || !jarName.equals(jarLists.get(0))) {
   throw new RuntimeException(
      "Unexpected result: the merged index must resolve file: "
         + file);
* Helper class for building jar files
*/
  throws FileNotFoundException, IOException {
   this.jarFile = new File(tmpFolder, jarName);
   this.os = new JarOutputStream(new FileOutputStream(jarFile));
  throws IOException {
   JarEntry entry = new JarEntry(pathFromRoot);
   os.putNextEntry(entry);
   os.write(content.getBytes("ASCII"));
   os.closeEntry();
   os.close();
   return jarFile;

PATCH [6901992] : Possible InvalidJarIndexException due to bug in sun.misc.JarIndex.merge() (original) (raw)

HG changeset patch

User muralx

Date 1339820030 10800

Node ID 7b531b09855a099fe0e9ea06ed7f77772cb62ed0

Parent fc575c78f5d314fd8ccbdc86c8b2d7631d736960