Add test case for situation where callback shouldn't be set because of behavior settings.

[awesomized/libmemcached] / libmemcached / storage.cc

diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc
index 0fc6e234df7d162be7a2646ec4f7629c050f65ce..703b0e3081da635fcb58490e6e32ced7bdd86d1a 100644 (file)
--- a/libmemcached/storage.cc
+++ b/libmemcached/storage.cc
@@ -126,7 +126,9 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
   request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->_namespace)));
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
   if (verb == APPEND_OP || verb == PREPEND_OP)
+  {
     send_length -= 8; /* append & prepend does not contain extras! */
+  }
   else
   {
     request.message.header.request.extlen= 8;
@@ -138,7 +140,9 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
                                                             request.message.header.request.extlen));
 
   if (cas)
+  {
     request.message.header.request.cas= memcached_htonll(cas);
+  }
 
   flush= (bool) ((server->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1);
 
@@ -355,8 +359,6 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
                                                 uint64_t cas,
                                                 memcached_storage_action_t verb)
 {
-  WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
-
   memcached_return_t rc;
   if (memcached_failed(rc= initialize_query(ptr)))
   {