From 637fc74640be8bf4575313d2fd317e265aaeb251 Mon Sep 17 00:00:00 2001
From: Dongryeol Lee <drselee@gmail.com>
Date: Thu, 30 Dec 2010 15:50:30 +0000
Subject: [PATCH] Almost there.

---
 .../thesis_research/core/gnp/distributed_dualtree_dfs_dev.h    | 2 +-
 .../contrib/dongryel/thesis_research/core/table/sub_table.h    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/gnp/distributed_dualtree_dfs_dev.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/gnp/distributed_dualtree_dfs_dev.h
index 128be0facd..f14b79f851 100644
--- a/fastlib/trunk/contrib/dongryel/thesis_research/core/gnp/distributed_dualtree_dfs_dev.h
+++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/gnp/distributed_dualtree_dfs_dev.h
@@ -85,7 +85,7 @@ void core::gnp::DistributedDualtreeDfs<DistributedProblemType>::ReduceScatter_(
             query_table_->local_table(), problem_->global());
           sub_problem.Init(sub_argument);
           sub_engine.Init(sub_problem);
-          sub_engine.set_base_case_flag(false);
+          sub_engine.set_base_case_flag(true);
           sub_engine.Compute(metric, query_results, false);
           printf("Unpruned query reference pairs: %d %d %d\n",
                  sub_engine.unpruned_query_reference_pairs().size(),
diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/sub_table.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/sub_table.h
index 48b91a596c..1bba4bb4a6 100644
--- a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/sub_table.h
+++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/sub_table.h
@@ -269,7 +269,7 @@ class SubTable {
     }
 
     ~SubTable() {
-      if(is_alias_ == false) {
+      if(is_alias_ == false && table_ != NULL) {
         if(core::table::global_m_file_) {
           core::table::global_m_file_->DestroyPtr(table_);
         }
@@ -338,6 +338,7 @@ class SubTable {
       TableType *table_in, TreeType *start_node_in,
       int max_num_levels_to_serialize_in) {
       table_ = table_in;
+      is_alias_ = true;
       start_node_ = start_node_in;
       max_num_levels_to_serialize_ = max_num_levels_to_serialize_in;
       data_ = &table_in->data();