Forráskód Böngészése

HDFS-15403. NPE in FileIoProvider#transferToSocketFully. Contributed by hemanthboyina.

Takanobu Asanuma 5 éve
szülő
commit
f41a144077

+ 6 - 1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/FileIoProvider.java

@@ -280,7 +280,12 @@ public class FileIoProvider {
       profilingEventHook.afterFileIo(volume, TRANSFER, begin, count);
       profilingEventHook.afterFileIo(volume, TRANSFER, begin, count);
     } catch (Exception e) {
     } catch (Exception e) {
       String em = e.getMessage();
       String em = e.getMessage();
-      if (!em.startsWith("Broken pipe") && !em.startsWith("Connection reset")) {
+      if (em != null) {
+        if (!em.startsWith("Broken pipe")
+            && !em.startsWith("Connection reset")) {
+          onFailure(volume, begin);
+        }
+      } else {
         onFailure(volume, begin);
         onFailure(volume, begin);
       }
       }
       throw e;
       throw e;