fix DebugInfo readObject bug
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/98c4f791 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/98c4f791 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/98c4f791 Branch: refs/heads/ODE-912 Commit: 98c4f791038e6969781ae603451f8fa032f2c638 Parents: 9cbe385 Author: fangzhen <[email protected]> Authored: Tue Jul 29 14:07:38 2014 +0800 Committer: fangzhen <[email protected]> Committed: Tue Jul 29 14:07:38 2014 +0800 ---------------------------------------------------------------------- .../ode/bpel/compiler_2_0/GoodCompileTest.java | 2 +- .../ode/bpel/compiler/MultipleEmbeddedSchemas.cbp | Bin 0 -> 11636 bytes .../java/org/apache/ode/bpel/obj/DebugInfo.java | 15 +-------------- 3 files changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/98c4f791/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java ---------------------------------------------------------------------- diff --git a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java index a27fb39..ab23b01 100644 --- a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java +++ b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java @@ -51,7 +51,7 @@ public class GoodCompileTest extends AbstractCompileTestCase implements CompileL wrapper.getProcess(); } catch (Exception ex) { ex.printStackTrace(); - Assert.fail("Compilation did not succeed."); + Assert.fail("Compilation or deserialization did not succeed."); } } http://git-wip-us.apache.org/repos/asf/ode/blob/98c4f791/bpel-compiler/src/test/resources/oldcbp/org/apache/ode/bpel/compiler/MultipleEmbeddedSchemas.cbp ---------------------------------------------------------------------- diff --git a/bpel-compiler/src/test/resources/oldcbp/org/apache/ode/bpel/compiler/MultipleEmbeddedSchemas.cbp b/bpel-compiler/src/test/resources/oldcbp/org/apache/ode/bpel/compiler/MultipleEmbeddedSchemas.cbp new file mode 100644 index 0000000..f114762 Binary files /dev/null and b/bpel-compiler/src/test/resources/oldcbp/org/apache/ode/bpel/compiler/MultipleEmbeddedSchemas.cbp differ http://git-wip-us.apache.org/repos/asf/ode/blob/98c4f791/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java index 3135a74..29947b2 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java @@ -118,19 +118,6 @@ public class DebugInfo extends ExtensibleImpl implements Serializable{ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException{ ois.defaultReadObject(); - int size = ois.readInt(); - String cls = (String)ois.readObject(); - try { - fieldContainer = (Map<String, Object>)(Class.forName(cls).newInstance()); - } catch (Exception e) { - //should never get here - e.printStackTrace(); - } - for (int i = 0; i < size; i++){ - String key = (String)ois.readObject(); - Object value = ois.readObject(); - if (!key.equals(DESCRIPTION)) - fieldContainer.put(key, value); - } + fieldContainer.remove(DESCRIPTION); } }
