aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc R. Hoffmann <hoffmann@mountainminds.com>2013-06-13 23:42:32 +0200
committerMarc R. Hoffmann <hoffmann@mountainminds.com>2013-06-13 23:42:32 +0200
commit54bf6f1ba2f668019647cf00c48d20929766dfa9 (patch)
tree01d4290388586799fab8c9046cfd1e9b05c668e2
parent1a29d520f517a485540486783006a033a64521be (diff)
downloadjacoco-54bf6f1ba2f668019647cf00c48d20929766dfa9.tar.gz
Support for Android Strict Mode (GitHub #113)
-rw-r--r--org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java5
-rw-r--r--org.jacoco.doc/docroot/doc/changes.html5
2 files changed, 8 insertions, 2 deletions
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
index b7c7b242..a56020dc 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
@@ -15,7 +15,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
-import java.net.UnknownHostException;
import javax.management.ObjectName;
import javax.management.StandardMBean;
@@ -177,7 +176,9 @@ public class Agent implements IAgent {
String host;
try {
host = InetAddress.getLocalHost().getHostName();
- } catch (final UnknownHostException e) {
+ } catch (final Exception e) {
+ // Also catch platform specific exceptions (like on Android) to
+ // avoid bailing out here
host = "unknownhost";
}
return host + "-" + AbstractRuntime.createRandomId();
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index 2b217c1e..e25ef8a5 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -20,6 +20,11 @@
<h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>
+<h3>New Features</h3>
+<ul>
+ <li>Support for Android <i>Strict Mode</i> (GitHub #113).</li>
+</ul>
+
<h2>Release 0.6.3 (2013/06/03)</h2>
<h3>New Features</h3>