From 4e0c46f93d13b2ae74db2680af79e131969818e5 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Mon, 25 May 2015 19:04:00 -0700
Subject: Explicitly call destructor of Mutex to release resources.

Change-Id: I808f4a3689e723d4490aa9ba6f1c14e3936ddcec
---
 src/google/protobuf/map_field.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/map_field.h')

diff --git a/src/google/protobuf/map_field.h b/src/google/protobuf/map_field.h
index 902aefce..56d3d0f4 100644
--- a/src/google/protobuf/map_field.h
+++ b/src/google/protobuf/map_field.h
@@ -68,7 +68,11 @@ class LIBPROTOBUF_EXPORT MapFieldBase {
         repeated_field_(NULL),
         entry_descriptor_(NULL),
         assign_descriptor_callback_(NULL),
-        state_(STATE_MODIFIED_MAP) {}
+        state_(STATE_MODIFIED_MAP) {
+    // Mutex's destructor needs to be called explicitly to release resources
+    // acquired in its constructor.
+    arena->OwnDestructor(&mutex_);
+  }
   virtual ~MapFieldBase();
 
   // Returns reference to internal repeated field. Data written using
-- 
cgit v1.2.3