Shortcut string creation in tracing functions.

This quick fix avoid useless creation of the message to be logged when tracing isn't enabled.

Change-Id: If1a667451c59afa67e25572f598e0826ce92f090
Signed-off-by: Etienne Bergeron <etienne.bergeron@gmail.com>
Reviewed-on: https://git.eclipse.org/r/18453
Reviewed-by: François Doray <fdoray.eclipse@gmail.com>
Tested-by: Hudson CI
IP-Clean: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfCoreTracer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfCoreTracer.java
index ae529c68393057c8151fa82f03d98d5949a3aec4..e4a57a76ab623b03170cc5b13361339a07d83472 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfCoreTracer.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfCoreTracer.java
@@ -167,6 +167,10 @@ public class TmfCoreTracer {
      * @param msg the trace message to log
      */
     public static synchronized void trace(String msg) {
+        // Leave when there is no place to write the message.
+        if (fTraceFile == null) {
+            return;
+        }
 
         // Set the timestamp (ms resolution)
         long currentTime = System.currentTimeMillis();
@@ -185,14 +189,12 @@ public class TmfCoreTracer {
         message.append(msg);
 
         // Write to file
-        if (fTraceFile != null) {
-            try {
-                fTraceFile.write(message.toString());
-                fTraceFile.newLine();
-                fTraceFile.flush();
-            } catch (IOException e) {
-                Activator.logError("Error writing to log file", e);
-            }
+        try {
+            fTraceFile.write(message.toString());
+            fTraceFile.newLine();
+            fTraceFile.flush();
+        } catch (IOException e) {
+            Activator.logError("Error writing to log file", e);
         }
     }
 

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/TmfUiTracer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/TmfUiTracer.java
index 8ed4889979489f80e4182c8c8e3a442bab94c6c8..0e95b5f42e7d454cdcbda773e0e5d1fef7c94124 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/TmfUiTracer.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/TmfUiTracer.java
@@ -154,6 +154,11 @@ public class TmfUiTracer {
      *            The event's message
      */
     public static void trace(String msg) {
+        // Leave when there is no place to write the message.
+        if (fTraceLog == null) {
+            return;
+        }
+
         long currentTime = System.currentTimeMillis();
         StringBuilder message = new StringBuilder("[");
         message.append(currentTime / 1000);
@@ -162,14 +167,12 @@ public class TmfUiTracer {
         message.append("] ");
         message.append(msg);
 
-        if (fTraceLog != null) {
-            try {
-                fTraceLog.write(message.toString());
-                fTraceLog.newLine();
-                fTraceLog.flush();
-            } catch (IOException e) {
-                Activator.getDefault().logError("Error writing to log file " + LOGNAME, e); //$NON-NLS-1$
-            }
+        try {
+            fTraceLog.write(message.toString());
+            fTraceLog.newLine();
+            fTraceLog.flush();
+        } catch (IOException e) {
+            Activator.getDefault().logError("Error writing to log file " + LOGNAME, e); //$NON-NLS-1$
         }
     }