svn commit: r1548750 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

[nd...@apache.org]

Author: ndimiduk
Date: Fri Dec  6 23:13:54 2013
New Revision: 1548750

URL: http://svn.apache.org/r1548750
Log:
HBASE-10061 TableMapReduceUtil.findOrCreateJar calls updateMap(null, ) resulting in thrown NPE (Amit Sela)

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1548750&r1=1548749&r2=1548750&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java Fri Dec  6 23:13:54 2013
@@ -683,7 +683,7 @@ public static void initCredentials(Job j
     }
 
     if (null == jar || jar.isEmpty()) {
-      throw new IOException("Cannot locate resource for class " + my_class.getName());
+      return null;
     }
 
     LOG.debug(String.format("For class %s, using jar %s", my_class.getName(), jar));
@@ -697,6 +697,9 @@ public static void initCredentials(Job j
    * @param packagedClasses map[class -> jar]
    */
   private static void updateMap(String jar, Map<String, String> packagedClasses) throws IOException {
+    if (null == jar || jar.isEmpty()) {
+      return;
+    }
     ZipFile zip = null;
     try {
       zip = new ZipFile(jar);