Merge remote-tracking branch 'origin' into 1.8.7

rubinius · Jan 26, 2015 · 52442ef · 52442ef
2 parents 7c89ed7 + 007040c
commit 52442ef
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/vm/shared_state.cpp b/vm/shared_state.cpp
@@ -82,6 +82,11 @@ namespace rubinius {
       console_ = 0;
     }
 
+    if(metrics_) {
+      delete metrics_;
+      metrics_ = 0;
+    }
+
     delete tool_broker_;
     delete global_cache;
     delete world_;