pcap: Replace a null-check by a NonNullUtils function in ConversionHelper

Change-Id: I41aaaa5bdcd7cbe849dcfc096350c91663763ac4
Signed-off-by: France Lapointe Nguyen <francelap@gmail.com>
Reviewed-on: https://git.eclipse.org/r/47226
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/org.eclipse.tracecompass.pcap.core/src/org/eclipse/tracecompass/internal/pcap/core/util/ConversionHelper.java b/org.eclipse.tracecompass.pcap.core/src/org/eclipse/tracecompass/internal/pcap/core/util/ConversionHelper.java
index 5899c23cda4fd230773f987ba399c7ab62b85001..500f2b2112714034a306a425ca3ed3886e0e94e9 100644 (file)
--- a/org.eclipse.tracecompass.pcap.core/src/org/eclipse/tracecompass/internal/pcap/core/util/ConversionHelper.java
+++ b/org.eclipse.tracecompass.pcap.core/src/org/eclipse/tracecompass/internal/pcap/core/util/ConversionHelper.java
@@ -18,6 +18,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.eclipse.tracecompass.common.core.NonNullUtils;
 import org.eclipse.tracecompass.internal.pcap.core.protocol.ethernet2.EthernetIIValues;
 
 /**
@@ -173,11 +174,7 @@ public final class ConversionHelper {
                 .append('.')
                 .append(String.format("%03d", ns)); //$NON-NLS-1$
 
-        String string = sb.toString();
-        if (string == null) {
-            return EMPTY_STRING;
-        }
-        return string;
+        return NonNullUtils.nullToEmptyString(sb);
 
     }