--- a/jdk/src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java Tue Nov 18 15:25:16 2014 -0800
+++ b/jdk/src/java.naming/share/classes/com/sun/naming/internal/VersionHelper.java Wed Dec 03 14:22:58 2014 +0000
@@ -159,12 +159,12 @@
}
/*
- * Returns an input stream for a file in <java.home>/lib,
+ * Returns an input stream for a file in <java.home>/conf,
* or null if it cannot be located or opened.
*
* @param filename The file name, sans directory.
*/
- InputStream getJavaHomeLibStream(String filename) {
+ InputStream getJavaHomeConfStream(String filename) {
PrivilegedAction<InputStream> act = () -> {
try {
String javahome = System.getProperty("java.home");
@@ -172,7 +172,7 @@
return null;
}
String pathname = javahome + File.separator +
- "lib" + File.separator + filename;
+ "conf" + File.separator + filename;
return new FileInputStream(pathname);
} catch (Exception e) {
return null;