Tests are back, minor fixes.

There is a cache tracking bug exposed in cachedel test, it is unclear if
this is a regression yet.

1 files changed, 12 insertions, 10 deletions

diff --git a/src/stable/myriad.cpp b/src/stable/myriad.cpp
index 492676e..53250c2 100644
--- a/src/stable/myriad.cpp
+++ b/src/stable/myriad.cpp
@@ -152,19 +152,21 @@ void Bu::Myriad::erase( Bu::Myriad::StreamId iStream )
                 "No such stream exists.");
     }
     Stream *pStream = hStream.get( iStream );
-    Bu::MutexLocker sl( pStream->mAccess );
-    if( pStream->iOpenCount > 0 )
     {
-        throw Bu::MyriadException( Bu::MyriadException::streamOpen,
-                "Cannot currently erase a stream while it is open.");
-    }
+        Bu::MutexLocker sl( pStream->mAccess );
+        if( pStream->iOpenCount > 0 )
+        {
+            throw Bu::MyriadException( Bu::MyriadException::streamOpen,
+                    "Cannot currently erase a stream while it is open.");
+        }
 
-    for( Bu::Array<int32_t>::iterator i = pStream->aBlocks.begin(); i; i++ )
-    {
-        releaseBlock( *i, false );
+        for( Bu::Array<int32_t>::iterator i = pStream->aBlocks.begin(); i; i++ )
+        {
+            releaseBlock( *i, false );
+        }
+        pStream->aBlocks.clear();
+        hStream.erase( iStream );
     }
-    pStream->aBlocks.clear();
-    hStream.erase( iStream );
     delete pStream;
 }