Merge pull request #445 from DavidFeng/patch

fix
This commit is contained in:
cloudwu
2016-01-27 13:55:14 +08:00

View File

@@ -140,10 +140,13 @@ end
local function watch_proto(protoname, cond) local function watch_proto(protoname, cond)
local proto = assert(replace_upvalue(skynet.register_protocol, "proto"), "Can't find proto table") local proto = assert(replace_upvalue(skynet.register_protocol, "proto"), "Can't find proto table")
local p = proto[protoname] local p = proto[protoname]
local dispatch = p.dispatch_origin or p.dispatch if p == nil then
if p == nil or dispatch == nil then
return "No " .. protoname return "No " .. protoname
end end
local dispatch = p.dispatch_origin or p.dispatch
if dispatch == nil then
return "No dispatch"
end
p.dispatch_origin = dispatch p.dispatch_origin = dispatch
p.dispatch = function(...) p.dispatch = function(...)
if not cond or cond(...) then if not cond or cond(...) then