commit 4c2715efb379d333ad1ad875d72fd666669cb501
author pier <pier@opennetworking.org> Thu Apr 11 18:20:01 2019 +0200
committer pier <pier@opennetworking.org> Thu Apr 11 20:35:39 2019 +0200
tree ee38a48b6e29a2e2df37911dea31b67016562077
parent 4a7ce67f41ba1b84bb63ddeea1a3aa26e51ab85b

Fix npe when host does not have valid ipv6 address

Change-Id: I411ec372eb16a1a2b5071a79b81af173de25bdbd
(cherry picked from commit 13b2cc62251e15b391f76507a2afc1cb470b6d37)

apps/t3/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java

diff --git a/apps/t3/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java b/apps/t3/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java
index 64fe2a0..5726f56 100644
--- a/apps/t3/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java
+++ b/apps/t3/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java
@@ -170,7 +170,7 @@
         IpAddress ipAddress;
         if (ipv4) {
             Criterion.Type type = src ? Criterion.Type.IPV4_SRC : Criterion.Type.IPV4_DST;
-            if (trace.getInitialPacket().getCriterion(type) != null) {
+            if (trace.getInitialPacket() != null && trace.getInitialPacket().getCriterion(type) != null) {
                 ipAddress = ((IPCriterion) trace.getInitialPacket()
                         .getCriterion(type)).ip().address();
             } else {
@@ -179,7 +179,7 @@
             }
         } else {
             Criterion.Type type = src ? Criterion.Type.IPV6_SRC : Criterion.Type.IPV6_DST;
-            if (trace.getInitialPacket().getCriterion(type) != null) {
+            if (trace.getInitialPacket() != null && trace.getInitialPacket().getCriterion(type) != null) {
                 ipAddress = ((IPCriterion) trace.getInitialPacket()
                         .getCriterion(type)).ip().address();
             } else {