Bug 462605 - [otdre] running OTDT on OTDRE
- fix names of dump files from otdre
diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/AbstractBoundClass.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/AbstractBoundClass.java
index 0981474..c30dc77 100644
--- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/AbstractBoundClass.java
+++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/AbstractBoundClass.java
@@ -193,8 +193,8 @@
* @param loader classloader responsible for loading this class
*/
protected AbstractBoundClass(String name, String id, ClassLoader loader) {
- if (name.indexOf('/')!= -1)
- new RuntimeException(name).printStackTrace(System.out);
+// if (name.indexOf('/')!= -1)
+// new RuntimeException(name).printStackTrace(System.out);
this.name = name;
this.internalName = name.replace('.', '/');
this.id = id;
diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java
index 5552049..7fd8156 100644
--- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java
+++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java
@@ -309,14 +309,11 @@
FileOutputStream fos = null;
try {
- String name = getName();
- int index = name.indexOf('/');
- if (index == -1)
- index = name.indexOf('.');
+ String name = getName().replaceAll("/", ".");
File dir = new File("otdyn");
if (!dir.exists())
dir.mkdir();
- String filename = "otdyn/" + name.substring(index + 1) + ".class";
+ String filename = "otdyn/" + name + ".class";
fos = new FileOutputStream(filename);
fos.write(allocateAndGetBytecode());
fos.close();
@@ -333,14 +330,11 @@
FileOutputStream fos = null;
try {
- String name = getName();
- int index = name.indexOf('/');
- if (index == -1)
- index = name.indexOf('.');
+ String name = getName().replaceAll("/", ".");
File dir = new File("otdyn");
if (!dir.exists())
dir.mkdir();
- String filename = "otdyn/" + name.substring(index + 1) + postfix+".#"+(n++);
+ String filename = "otdyn/" + name + postfix+".#"+(n++);
fos = new FileOutputStream(filename);
fos.write(bytecode);
fos.close();