HBASE-12491 TableMapReduceUtil.findContainingJar() NPE
This commit is contained in:
parent
555e78005d
commit
b94b0e9ca7
|
@ -900,8 +900,10 @@ public class TableMapReduceUtil {
|
||||||
private static String findContainingJar(Class<?> my_class, Map<String, String> packagedClasses)
|
private static String findContainingJar(Class<?> my_class, Map<String, String> packagedClasses)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
ClassLoader loader = my_class.getClassLoader();
|
ClassLoader loader = my_class.getClassLoader();
|
||||||
|
|
||||||
String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";
|
String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";
|
||||||
|
|
||||||
|
if (loader != null) {
|
||||||
// first search the classpath
|
// first search the classpath
|
||||||
for (Enumeration<URL> itr = loader.getResources(class_file); itr.hasMoreElements();) {
|
for (Enumeration<URL> itr = loader.getResources(class_file); itr.hasMoreElements();) {
|
||||||
URL url = itr.nextElement();
|
URL url = itr.nextElement();
|
||||||
|
@ -921,6 +923,7 @@ public class TableMapReduceUtil {
|
||||||
return toReturn.replaceAll("!.*$", "");
|
return toReturn.replaceAll("!.*$", "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// now look in any jars we've packaged using JarFinder. Returns null when
|
// now look in any jars we've packaged using JarFinder. Returns null when
|
||||||
// no jar is found.
|
// no jar is found.
|
||||||
|
|
Loading…
Reference in New Issue