| Yuta HIGUCHI | a7ec073 | 2014-03-10 16:01:06 -0700 | [diff] [blame] | 1 | diff --git a/GNUmakefile b/GNUmakefile |
| 2 | index e4c9a07..199fac1 100644 |
| 3 | --- a/GNUmakefile |
| 4 | +++ b/GNUmakefile |
| 5 | @@ -23,8 +23,8 @@ OBJDIR := obj$(OBJSUFFIX) |
| 6 | |
| 7 | TOP := $(shell echo $${PWD-`pwd`}) |
| 8 | GTEST_DIR ?= $(TOP)/gtest |
| 9 | -ZOOKEEPER_LIB := /usr/local/lib/libzookeeper_mt.a |
| 10 | -ZOOKEEPER_DIR := /usr/local/zookeeper-3.4.5 |
| 11 | +ZOOKEEPER_LIB ?= /usr/local/lib/libzookeeper_mt.a |
| 12 | +ZOOKEEPER_DIR ?= /usr/local/zookeeper-3.4.5 |
| 13 | |
| 14 | ifeq ($(DEBUG),yes) |
| 15 | BASECFLAGS := -g |
| 16 | diff --git a/src/MasterService.cc b/src/MasterService.cc |
| 17 | index 93cfb5d..02876c7 100644 |
| 18 | --- a/src/MasterService.cc |
| 19 | +++ b/src/MasterService.cc |
| 20 | @@ -613,7 +613,7 @@ MasterService::multiWrite(const WireFormat::MultiOp::Request* reqHdr, |
| 21 | reqOffset, currentReq->valueLength); |
| 22 | reqOffset += currentReq->valueLength; |
| 23 | |
| 24 | - if (stringKey == NULL || value == NULL) { |
| 25 | + if (stringKey == NULL) { |
| 26 | respHdr->common.status = STATUS_REQUEST_FORMAT_ERROR; |
| 27 | break; |
| 28 | } |