# HG changeset patch
# User dcubed
# Date 1365203778 25200
# Node ID 46d24f112c273e51c0dd4f9af4aa682a53c67eb8
# Parent  4c8bb5e4f68f471f2ea56d29b6b8f6ea9643c96a# Parent  8be1318fbe77ebf8518ce1c7b590b4067edc5285
Merge

diff -r 8be1318fbe77 -r 46d24f112c27 src/share/vm/services/memTracker.cpp
--- a/src/share/vm/services/memTracker.cpp	Fri Apr 05 10:38:08 2013 -0700
+++ b/src/share/vm/services/memTracker.cpp	Fri Apr 05 16:16:18 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,12 +127,15 @@
   assert(_state == NMT_bootstrapping_multi_thread, "wrong state");
 
   _snapshot = new (std::nothrow)MemSnapshot();
-  if (_snapshot != NULL && !_snapshot->out_of_memory()) {
-    if (start_worker()) {
+  if (_snapshot != NULL) {
+    if (!_snapshot->out_of_memory() && start_worker()) {
       _state = NMT_started;
       NMT_track_callsite = (_tracking_level == NMT_detail && can_walk_stack());
       return;
     }
+
+    delete _snapshot;
+    _snapshot = NULL;
   }
 
   // fail to start native memory tracking, shut it down
@@ -544,7 +547,10 @@
   assert(_worker_thread == NULL, "Just Check");
   _worker_thread = new (std::nothrow) MemTrackWorker();
   if (_worker_thread == NULL || _worker_thread->has_error()) {
-    shutdown(NMT_initialization);
+    if (_worker_thread != NULL) {
+      delete _worker_thread;
+      _worker_thread = NULL;
+    }
     return false;
   }
   _worker_thread->start();