Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Peria de Sene2015-01-26 15:42:41 +0000
committerRoland Grunberg2015-02-11 21:29:14 +0000
commitd1da5b2d0554a775d7119d577b04d4358f74aee3 (patch)
treecfb1a5e6522f25a1d6be10b1f32374b6144aa56c
parentd8382a9472f547583dfbc92d6d3ef4b70834ecfe (diff)
downloadorg.eclipse.linuxtools-d1da5b2d0554a775d7119d577b04d4358f74aee3.tar.gz
org.eclipse.linuxtools-d1da5b2d0554a775d7119d577b04d4358f74aee3.tar.xz
org.eclipse.linuxtools-d1da5b2d0554a775d7119d577b04d4358f74aee3.zip
[oprofile] - Verify text is not null when opening oprofile daemon log.
Change-Id: Ic2d423612e59af5c7a6881d2cd5d59c78a08cfc4 Signed-off-by: Rafael Peria de Sene <rpsene@br.ibm.com> Reviewed-on: https://git.eclipse.org/r/40367 Reviewed-by: Roland Grunberg <rgrunber@redhat.com> Tested-by: Roland Grunberg <rgrunber@redhat.com>
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLogReaderAction.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLogReaderAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLogReaderAction.java
index 396f570185..2a9404cee5 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLogReaderAction.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLogReaderAction.java
@@ -152,9 +152,11 @@ class OprofiledLogDialog extends MessageDialog {
area.setLayoutData(gd);
Text txt = new Text(area, SWT.READ_ONLY | SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
- txt.setText(textContent);
+ //Check if the textContent isn't null
+ if (textContent != null){
+ txt.setText(textContent);
+ }
txt.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
return area;
}
}

Back to the top