[ignite-332]: improved error checking.

apache · Feb 24, 2015 · dc085d8 · dc085d8
1 parent 45ce814
commit dc085d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@ -104,7 +104,9 @@ public class GridHadoopClientProtocol implements ClientProtocol {
             GridHadoopJobStatus status = cli.compute().execute(GridHadoopProtocolSubmitJobTask.class.getName(),
                 new GridHadoopProtocolTaskArguments(jobId.getJtIdentifier(), jobId.getId(), createJobInfo(conf)));
 
-            assert status != null;
+            if (status == null) {
+                throw new IOException("Null status obtained on attempt to submit Hadoop job " + jobId);
+            }
 
             return processStatus(status);
         }

diff --git a/.../src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultJobInfo.java b/.../src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultJobInfo.java
@@ -101,8 +101,9 @@ public GridHadoopDefaultJobInfo(String jobName, String user, boolean hasCombiner
 
             return (GridHadoopJob)constructor.newInstance(jobId, this, log);
         }
-        catch (Exception e) {
+        // NB: java.lang.NoClassDefFoundError may be thrown from Class#getConstructor() call.
-            throw new IgniteCheckedException(e);
+        catch (Throwable t) {
+            throw new IgniteCheckedException(t);
         }
     }