1 files changed, 12 insertions, 12 deletions
diff --git a/cpukit/posix/src/keyrundestructors.c b/cpukit/posix/src/keyrundestructors.c
index 762e2e6f85..96147a539d 100644
--- a/cpukit/posix/src/keyrundestructors.c
+++ b/cpukit/posix/src/keyrundestructors.c
@@ -7,7 +7,7 @@
 
 /*
  * Copyright (c) 2012 Zhongwei Yao.
- * Copyright (c) 2010 embedded brains GmbH.
+ * Copyright (c) 2010-2014 embedded brains GmbH.
  *
  * COPYRIGHT (c) 1989-2014.
  * On-Line Applications Research Corporation (OAR).
@@ -22,6 +22,7 @@
 #endif
 
 #include <rtems/posix/keyimpl.h>
+#include <rtems/score/assert.h>
 #include <rtems/score/chainimpl.h>
 #include <rtems/score/thread.h>
 
@@ -44,14 +45,15 @@ void _POSIX_Keys_Run_destructors(
   POSIX_Keys_Control *the_key;
   Objects_Locations location;
 
-  _Thread_Disable_dispatch();
-
   chain = &thread->Key_Chain;
   iter = (POSIX_Keys_Key_value_pair *) _Chain_First( chain );
   while ( !_Chain_Is_tail( chain, &iter->Key_values_per_thread_node ) ) {
     next = (POSIX_Keys_Key_value_pair *)
       _Chain_Next( &iter->Key_values_per_thread_node );
 
+    the_key = _POSIX_Keys_Get( iter->key, &location );
+    _Assert( location == OBJECTS_LOCAL );
+
     /**
      * remove key from rbtree and chain.
      * here Chain_Node *iter can be convert to POSIX_Keys_Key_value_pair *,
@@ -64,21 +66,19 @@ void _POSIX_Keys_Run_destructors(
     );
     _Chain_Extract_unprotected( &iter->Key_values_per_thread_node );
 
-    /**
-     * run key value's destructor if destructor and value are both non-null.
-     */
-    the_key = _POSIX_Keys_Get( iter->key, &location );
     destructor = the_key->destructor;
     value = iter->value;
-    if ( destructor != NULL && value != NULL )
-      (*destructor)( value );
+
+    _POSIX_Keys_Key_value_pair_free( iter );
 
     _Objects_Put( &the_key->Object );
 
-    _POSIX_Keys_Key_value_pair_free( iter );
+    /**
+     * run key value's destructor if destructor and value are both non-null.
+     */
+    if ( destructor != NULL && value != NULL )
+      (*destructor)( value );
 
     iter = next;
   }
-
-  _Thread_Enable_dispatch();
 }