1 files changed, 6 insertions, 2 deletions
diff --git a/src/ccapi/server/ccs_cache_collection.c b/src/ccapi/server/ccs_cache_collection.c
index 4927aaacb7..44cf5a8824 100644
--- a/src/ccapi/server/ccs_cache_collection.c
+++ b/src/ccapi/server/ccs_cache_collection.c
@@ -939,8 +939,12 @@ static cc_int32 ccs_cache_collection_unlock (ccs_pipe_t             in_client_pi
     
     if (!err) {
         *out_will_block = will_block;
-        *out_reply_data = reply_data;
-        reply_data = NULL; /* take ownership */
+        if (!will_block) {
+            *out_reply_data = reply_data;
+            reply_data = NULL; /* take ownership */
+        } else {
+            *out_reply_data = NULL;
+        }
     }
     
     cci_stream_release (reply_data);