Avoid false error messages when launches terminate before exec data h…

…as been written.

com.mountainminds.eclemma.core.test/src/com/mountainminds/eclemma/internal/core/ExecutionDataDumperTest.java

@@ -12,7 +12,9 @@
 package com.mountainminds.eclemma.internal.core;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -63,6 +65,7 @@ public void setup() throws IOException {
  public void testEmpty() throws Exception {
  out.close();
  assertNull(dumper.dump());
+ assertFalse(dumper.hasDataReceived());
  }
 
  @Test
@@ -71,12 +74,15 @@ public void testTwoSessions() throws Exception {
  writer.visitClassExecution(new ExecutionData(11, "Clazz1", new boolean[8]));
  writer.sendCmdOk();
  verifyExecContent(dumper.dump(), "Clazz1");
+ assertTrue(dumper.hasDataReceived());
 
  writer.visitSessionInfo(new SessionInfo("Session", 10, 20));
  writer.visitClassExecution(new ExecutionData(11, "Clazz2", new boolean[8]));
  writer.sendCmdOk();
  out.close();
  verifyExecContent(dumper.dump(), "Clazz2");
+ assertTrue(dumper.hasDataReceived());
+
  assertNull(dumper.dump());
  }
 

com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/internal/core/ExecutionDataDumper.java

@@ -32,10 +32,13 @@ public class ExecutionDataDumper {
  private final ExecutionDataReader reader;
  private final ExecutionDataFiles files;
 
+ private boolean dataReceived;
+
  public ExecutionDataDumper(ExecutionDataReader reader,
  ExecutionDataFiles files) {
  this.reader = reader;
  this.files = files;
+ this.dataReceived = false;
  }
 
  public IPath dump() throws IOException, CoreException {
@@ -47,6 +50,7 @@ public IPath dump() throws IOException, CoreException {
  if (sessionInfos.isEmpty()) {
  return null;
  }
+ dataReceived = true;
  return createDataFile(sessionInfos, executionData);
  }
 
@@ -62,4 +66,8 @@ private IPath createDataFile(SessionInfoStore sessionInfos,
  return file;
  }
 
+ public boolean hasDataReceived() {
+ return dataReceived;
+ }
+
 }

com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/internal/core/launching/AgentServer.java

@@ -50,7 +50,7 @@ public class AgentServer extends Job {
 
  private ServerSocket serverSocket;
  private RemoteControlWriter writer;
- private boolean dataReceived;
+ private ExecutionDataDumper dumper;
 
  AgentServer(ICoverageLaunch launch, ISessionManager sessionManager,
  ExecutionDataFiles files, ICorePreferences preferences) {
@@ -60,7 +60,6 @@ public class AgentServer extends Job {
  this.launch = launch;
  this.sessionManager = sessionManager;
  this.files = files;
- this.dataReceived = false;
  }
 
  public void start() throws CoreException {
@@ -96,7 +95,7 @@ public void stop() {
  }
 
  public boolean hasDataReceived() {
- return dataReceived;
+ return dumper != null && dumper.hasDataReceived();
  }
 
  public int getPort() {
@@ -110,15 +109,14 @@ protected IStatus run(IProgressMonitor monitor) {
  writer = new RemoteControlWriter(socket.getOutputStream());
  final RemoteControlReader reader = new RemoteControlReader(
  socket.getInputStream());
- final ExecutionDataDumper dumper = new ExecutionDataDumper(reader, files);
+ dumper = new ExecutionDataDumper(reader, files);
  IPath execfile;
  while ((execfile = dumper.dump()) != null) {
  final CoverageSession session = new CoverageSession(
  createDescription(), launch.getScope(), execfile,
  launch.getLaunchConfiguration());
  sessionManager.addSession(session,
  preferences.getActivateNewSessions(), launch);
- dataReceived = true;
  }
  } catch (IOException e) {
  return EclEmmaStatus.EXECDATA_DUMP_ERROR.getStatus(e);