diff options
| author | Brian Aker <brian@tangent.org> | 2012-09-10 03:42:54 -0400 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2012-09-10 03:42:54 -0400 |
| commit | 850df1fbab46a5a658c2fd0c35164ef1c60a22d9 (patch) | |
| tree | dbeb6c2542c077c3f653b693885f8b56c6fe2fb3 /libmemcached/server.cc | |
| parent | de23af474c65e0082cd5d9e60fc4cdb10468a0d3 (diff) | |
| download | libmemcached-850df1fbab46a5a658c2fd0c35164ef1c60a22d9.tar.gz | |
Fix case where --socket was not always been stored correctly.
Diffstat (limited to 'libmemcached/server.cc')
| -rw-r--r-- | libmemcached/server.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmemcached/server.cc b/libmemcached/server.cc index f68e1f6b..20db52b8 100644 --- a/libmemcached/server.cc +++ b/libmemcached/server.cc @@ -194,10 +194,12 @@ uint32_t memcached_server_count(const memcached_st *self) const char *memcached_server_name(const memcached_server_instance_st self) { WATCHPOINT_ASSERT(self); - if (self == NULL) - return NULL; + if (self) + { + return self->hostname; + } - return self->hostname; + return NULL; } in_port_t memcached_server_port(const memcached_server_instance_st self) |