You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2017/03/29 19:49:08 UTC

incubator-mnemonic git commit: MNEMONIC-234: Reorder field destroy of a durable data structure

Repository: incubator-mnemonic
Updated Branches:
  refs/heads/master 9c9312e51 -> 099389ecf


MNEMONIC-234: Reorder field destroy of a durable data structure


Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/099389ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/099389ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/099389ec

Branch: refs/heads/master
Commit: 099389ecfaa5547c6c1fed2e36d6f68ccf8106e1
Parents: 9c9312e
Author: Johnu George <jo...@cisco.com>
Authored: Wed Mar 29 12:20:18 2017 -0700
Committer: Johnu George <jo...@cisco.com>
Committed: Wed Mar 29 12:30:55 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/mnemonic/AnnotatedDurableEntityClass.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/099389ec/mnemonic-core/src/main/java/org/apache/mnemonic/AnnotatedDurableEntityClass.java
----------------------------------------------------------------------
diff --git a/mnemonic-core/src/main/java/org/apache/mnemonic/AnnotatedDurableEntityClass.java b/mnemonic-core/src/main/java/org/apache/mnemonic/AnnotatedDurableEntityClass.java
index 84fd9ab..a6cbaf0 100644
--- a/mnemonic-core/src/main/java/org/apache/mnemonic/AnnotatedDurableEntityClass.java
+++ b/mnemonic-core/src/main/java/org/apache/mnemonic/AnnotatedDurableEntityClass.java
@@ -742,7 +742,6 @@ public class AnnotatedDurableEntityClass {
         code.addStatement("return $1N", autoreclaimname);
         break;
       case "destroy":
-        code.addStatement("$1N.destroy()", holdername);
         for (String fname : m_dynfieldsinfo.keySet()) {
           dynfieldinfo = m_dynfieldsinfo.get(fname);
           if (!isUnboxPrimitive(dynfieldinfo.type)) {
@@ -752,6 +751,7 @@ public class AnnotatedDurableEntityClass {
             code.endControlFlow();
           }
         }
+        code.addStatement("$1N.destroy()", holdername);
         break;
       case "getNativeFieldInfo":
         code.addStatement("return $1N", m_fieldsinfo.get("nfieldinfo").name);