Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2019-01-10 18:39:08 -0500
committerJeff Johnston2019-01-10 18:57:56 -0500
commitfb5f9ca93b6894219014306b41a7505c129b65b4 (patch)
tree4e0390cd8c7975c13fbe868c19f7053ae8194962
parent99938437f44d0186076d5aa9a7eca7626e186ed7 (diff)
downloadorg.eclipse.cdt-fb5f9ca93b6894219014306b41a7505c129b65b4.tar.gz
org.eclipse.cdt-fb5f9ca93b6894219014306b41a7505c129b65b4.tar.xz
org.eclipse.cdt-fb5f9ca93b6894219014306b41a7505c129b65b4.zip
Bug 543353 - CDT TestModelManager setTestingTime requires null check
- add check for null in TestModelManager.setTestingTime() Change-Id: Ideac81dcc4a1584f6be4088bbe410436f1c010db
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF2
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF b/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
index 38ba7d58c5..8b4724df43 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
+++ b/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.testsrunner;singleton:=true
-Bundle-Version: 8.1.1.qualifier
+Bundle-Version: 8.1.2.qualifier
Bundle-Activator: org.eclipse.cdt.testsrunner.internal.TestsRunnerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java
index 0bd655a748..67be200695 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java
@@ -416,7 +416,9 @@ public class TestModelManager implements ITestModelUpdater, ITestModelAccessor {
@Override
public void setTestingTime(int testingTime) {
- currentTestCase.setTestingTime(testingTime);
+ if (currentTestCase != null) {
+ currentTestCase.setTestingTime(testingTime);
+ }
}
@Override

Back to the top