X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fsimulator%2Fjava%2Feclipse-plugin%2FServiceProviderPlugin%2Fsrc%2Foic%2Fsimulator%2Flogger%2FLogLabelProvider.java;h=832e99079c315e1cee178ee4f834ec6c983bb681;hb=74baf010a52222146837bea48c89dc494c1e7ab9;hp=9861d775e5af898dfc94e8307849e3a1f1ede584;hpb=902a16943ce382dcbd2a7aeb52592fa1e525e576;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java
index 9861d77..832e990 100644
--- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java
+++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java
@@ -51,9 +51,11 @@ public class LogLabelProvider extends LabelProvider implements
             return dateFormat.format(entry.getDate());
         } else {
             String msg = entry.getMessage();
-            int pos = msg.indexOf('\n');
-            if (pos != -1) {
-                msg = msg.substring(0, pos);
+            if (null != msg) {
+                int pos = msg.indexOf('\n');
+                if (pos != -1) {
+                    msg = msg.substring(0, pos);
+                }
             }
             return msg;
         }