Merge branch '2.0' into develop

basho · Sep 4, 2014 · c93682a · c93682a
2 parents 8f1d1f6 + 2c9c5a5
commit c93682a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/c_src/build_deps.sh b/c_src/build_deps.sh
@@ -8,7 +8,7 @@ if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then
 fi
 unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well
 
-LEVELDB_VSN="develop"
+LEVELDB_VSN="2.0.0"
 
 SNAPPY_VSN="1.0.4"
 

diff --git a/c_src/refobjects.cc b/c_src/refobjects.cc
@@ -548,7 +548,10 @@ ItrObject::~ItrObject()
     ReleaseReuseMove();
 
     if (NULL!=itr_ref_env)
+    {
         enif_free_env(itr_ref_env);
+        itr_ref_env=NULL;
+    }   // if
 
     if (NULL!=m_DbPtr.get())
         m_DbPtr->RemoveReference(this);
@@ -568,14 +571,6 @@ ItrObject::Shutdown()
     //   release when move object destructs)
     ReleaseReuseMove();
 
-    // only need this to create new Move objects,
-    //  get rid of it early
-    if (NULL!=itr_ref_env)
-    {
-        enif_free_env(itr_ref_env);
-        itr_ref_env=NULL;
-    }   // if
-
     // ItrObject and m_Iter each hold pointers to other, release ours
     m_Iter.assign(NULL);