aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/PreMain.java2
-rw-r--r--org.jacoco.doc/docroot/doc/changes.html2
-rw-r--r--org.jacoco.doc/docroot/doc/implementation.html4
3 files changed, 6 insertions, 2 deletions
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/PreMain.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/PreMain.java
index 68f5baf9..83977372 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/PreMain.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/PreMain.java
@@ -52,7 +52,7 @@ public final class PreMain {
private static IRuntime createRuntime(final Instrumentation inst)
throws Exception {
- return ModifiedSystemClassRuntime.createFor(inst, "java/util/UUID");
+ return ModifiedSystemClassRuntime.createFor(inst, "java/lang/UnknownError");
}
}
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index 88a4b1b0..e5dc783a 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -53,6 +53,8 @@
<li>More information about context is provided when unable to read stream during
analysis
(GitHub <a href="https://github.com/jacoco/jacoco/issues/541">#541</a>).</li>
+ <li>Reduced chance of conflict with other agents
+ (GitHub <a href="https://github.com/jacoco/jacoco/issues/555">#555</a>).</li>
</ul>
<h3>Non-functional Changes</h3>
diff --git a/org.jacoco.doc/docroot/doc/implementation.html b/org.jacoco.doc/docroot/doc/implementation.html
index bea6f736..b1eda7f3 100644
--- a/org.jacoco.doc/docroot/doc/implementation.html
+++ b/org.jacoco.doc/docroot/doc/implementation.html
@@ -215,7 +215,9 @@ boolean[] probes = (boolean[]) args[0];
<p>
The current JaCoCo Java agent implementation uses the
<code>ModifiedSystemClassRuntime</code> adding a field to the class
- <code>java.util.UUID</code>.
+ <code>java.lang.UnknownError</code>. Versions 0.5.0 - 0.7.9 were adding field
+ to the class <code>java.util.UUID</code>, having bigger chance of conflict
+ with other agents.
</p>