diff options
author | Stephan Herrmann | 2019-03-02 14:54:35 +0000 |
---|---|---|
committer | Stephan Herrmann | 2019-03-02 14:54:35 +0000 |
commit | 8c0e616c9093761c2f9064491bdc0017b0624fad (patch) | |
tree | 3f1006a88cc7f3d4ee31f29ded138cddb8ddda05 | |
parent | f5e48f2d92bfe53ae659bf3d604bf77bdeb723b3 (diff) | |
download | org.eclipse.objectteams-8c0e616c9093761c2f9064491bdc0017b0624fad.tar.gz org.eclipse.objectteams-8c0e616c9093761c2f9064491bdc0017b0624fad.tar.xz org.eclipse.objectteams-8c0e616c9093761c2f9064491bdc0017b0624fad.zip |
Bug 544979 - [debug][otdre] Plain Java (OT/J) launches also need to
react to redefineClasses
3 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF index 4e5f4cb7f..4b74aeb24 100644 --- a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.objectteams.otredyn Automatic-Module-Name: org.eclipse.objectteams.otredyn -Bundle-Version: 1.3.3.qualifier +Bundle-Version: 1.3.4.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.objectteams.otredyn.bytecode, diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/OtreRedefineStrategy.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/OtreRedefineStrategy.java index 2198b0d97..a41e93f88 100644 --- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/OtreRedefineStrategy.java +++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/OtreRedefineStrategy.java @@ -20,6 +20,7 @@ import java.lang.instrument.ClassDefinition; import java.lang.instrument.UnmodifiableClassException;
import org.eclipse.objectteams.otredyn.transformer.jplis.otreAgent;
+import org.eclipse.objectteams.runtime.DebugHooks;
/**
* This implementation of {@link IRedefineStrategy} uses the
@@ -32,6 +33,7 @@ public class OtreRedefineStrategy implements IRedefineStrategy { ClassDefinition arr_cd[] = { new ClassDefinition(clazz, bytecode) };
try {
otreAgent.getInstrumentation().redefineClasses(arr_cd);
+ DebugHooks.afterRedefineClasses(clazz.getName());
} catch (ClassFormatError cfe) {
// error output during redefinition tends to swallow the stack, print it now:
System.err.println("OTDRE: Error redifining "+clazz.getName());
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in index 3e68d32dc..c1123eb63 100644 --- a/releng/map/otdt.map.in +++ b/releng/map/otdt.map.in @@ -22,7 +22,7 @@ plugin@org.eclipse.objectteams.otdt.doc=GIT,repo=git://git.eclipse.org/gitroot/o plugin@org.eclipse.objectteams.runtime=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.runtime,tag=builds/201812061254
plugin@org.eclipse.objectteams.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otre,tag=builds/201806120901
-plugin@org.eclipse.objectteams.otredyn=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otredyn,tag=builds/201812061254
+plugin@org.eclipse.objectteams.otredyn=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otredyn
!the following is also referenced in otdt.doc/buildDoc.xml (plugin-name without version):
plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox,tag=builds/201812061254
fragment@org.eclipse.objectteams.otequinox.turbo=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.turbo,tag=builds/201506091717
|