SF #3487904: Avoid NPE in case of new and empty launch configurations.

jacoco · Feb 15, 2012 · bc9321c · bc9321c
1 parent 194686b
commit bc9321c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/...a.core.test/src/com/mountainminds/eclemma/core/launching/JavaApplicationLauncherTest.java b/...a.core.test/src/com/mountainminds/eclemma/core/launching/JavaApplicationLauncherTest.java
@@ -54,6 +54,19 @@ public void teardown() throws Exception {
  javaProject2.destroy();
  }
 
+ @Test
+ public void testNoProject() throws Exception {
+ JavaProjectKit.waitForBuild();
+
+ ILaunchConfigurationWorkingCopy configuration = getJavaApplicationType()
+ .newInstance(javaProject1.project, "test.launch");
+
+ final Collection<IPackageFragmentRoot> scope = launcher
+ .getOverallScope(configuration);
+
+ assertEquals(set(), set(scope));
+ }
+
  @Test
  public void testProjectWithSourceFolders() throws Exception {
  IPackageFragmentRoot rootSrc1 = javaProject1.createSourceFolder("src");

diff --git a/...ds.eclemma.core/src/com/mountainminds/eclemma/core/launching/JavaApplicationLauncher.java b/...ds.eclemma.core/src/com/mountainminds/eclemma/core/launching/JavaApplicationLauncher.java
@@ -12,6 +12,7 @@
 package com.mountainminds.eclemma.core.launching;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Set;
 
 import org.eclipse.core.runtime.CoreException;
@@ -30,8 +31,12 @@ public class JavaApplicationLauncher extends CoverageLauncher {
  public Set<IPackageFragmentRoot> getOverallScope(
  ILaunchConfiguration configuration) throws CoreException {
  final IJavaProject project = JavaRuntime.getJavaProject(configuration);
- return ScopeUtils.filterJREEntries(Arrays.asList(project
- .getAllPackageFragmentRoots()));
+ if (project == null) {
+ return Collections.emptySet();
+ } else {
+ return ScopeUtils.filterJREEntries(Arrays.asList(project
+ .getAllPackageFragmentRoots()));
+ }
  }
 
 }
diff --git a/com.mountainminds.eclemma.doc/pages/changes.html b/com.mountainminds.eclemma.doc/pages/changes.html
@@ -19,6 +19,7 @@ <h2>Trunk</h2>
  <li>For long-running processes intermediate coverage data dumps can now be
  collected without terminating the application under test.</li>
  <li>Trac #168: New editor for JaCoCo execution data files.</li>
+ <li>SF #3487904: Avoid NPE in case of new and empty launch configurations.</li>
  <li>SF #3477725: Java agent must not be added multiple times to plug-in
  launch configurations.</li> 
 </ul>