More tests.

2 files changed, 14 insertions, 20 deletions

diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/Agent.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/Agent.java
index 67ccdccc..71406fbf 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/Agent.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/Agent.java
@@ -38,11 +38,8 @@ public class Agent {
 	 * @param options
 	 *            options to configure the instance
 	 * @return global instance
-	 * @throws Exception
-	 *             in case of startup failures of the corresponding controller
 	 */
-	public static synchronized Agent getInstance(final AgentOptions options)
-			throws Exception {
+	public static synchronized Agent getInstance(final AgentOptions options) {
 		if (singleton == null) {
 			final Agent agent = new Agent(options, IExceptionLogger.SYSTEM_ERR);
 			agent.startup();
@@ -91,17 +88,19 @@ public class Agent {
 	/**
 	 * Initializes this agent.
 	 * 
-	 * @throws Exception
-	 *             internal startup problem
 	 */
-	public void startup() throws Exception {
-		String sessionId = options.getSessionId();
-		if (sessionId == null) {
-			sessionId = createSessionId();
+	public void startup() {
+		try {
+			String sessionId = options.getSessionId();
+			if (sessionId == null) {
+				sessionId = createSessionId();
+			}
+			data.setSessionId(sessionId);
+			controller = createAgentController();
+			controller.startup(options, data);
+		} catch (final Exception e) {
+			logger.logExeption(e);
 		}
-		data.setSessionId(sessionId);
-		controller = createAgentController();
-		controller.startup(options, data);
 	}
 
 	/**
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/RT.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/RT.java
index 87bbc190..c760b0e2 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/RT.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/RT.java
@@ -23,13 +23,8 @@ public class RT {
 	private static final RuntimeData data;
 
 	static {
-		try {
-			final Agent agent = Agent.getInstance(new AgentOptions(
-					System.getProperties()));
-			data = agent.getData();
-		} catch (final Exception e) {
-			throw new RuntimeException("Error while creating JaCoCo Runtime", e);
-		}
+		final AgentOptions options = new AgentOptions(System.getProperties());
+		data = Agent.getInstance(options).getData();
 	}
 
 	/**