jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/file/JavacFileManager.java

-:b030706da5b4
+:72833a8a6086
 if (archive == null) {
 try {
 archive = openArchive(directory);
 } catch (IOException ex) {
 log.error("error.reading.file",
-directory, ex.getLocalizedMessage());
+directory, getMessage(ex));
 return;
 }
 }
 List<String> files = archive.getFiles(subdirectory);
 }
 } catch (FileNotFoundException ex) {
 archive = new MissingArchive(zipFileName);
 } catch (IOException ex) {
 if (zipFileName.exists())
-log.error("error.reading.file", zipFileName, ex.getLocalizedMessage());
+log.error("error.reading.file", zipFileName, getMessage(ex));
 archive = new MissingArchive(zipFileName);
 }
 archives.put(origZipFileName, archive);
 }
 if (isRelativeUri(result))
 return result;
 }
 throw new IllegalArgumentException("Invalid relative path: " + file);
 }
+/**
+* Get a detail message from an IOException.
+* Most, but not all, instances of IOException provide a non-null result
+* for getLocalizedMessage().  But some instances return null: in these
+* cases, fallover to getMessage(), and if even that is null, return the
+* name of the exception itself.
+* @param e an IOException
+* @return a string to include in a compiler diagnostic
+*/
+public static String getMessage(IOException e) {
+String s = e.getLocalizedMessage();
+if (s != null)
+return s;
+s = e.getMessage();
+if (s != null)
+return s;
+return e.toString();
+}
 }

Mercurial > jdk8-mips64-public > langtools / file comparison