Merge remote-tracking branch 'origin/1.2'

This commit is contained in:
Bryan Boreham committed 2015-11-12 10:43:01 +00:00
commit 79f8a8f909
1 file changed
+4 -1
+4 -1
View File
@@ -663,7 +663,10 @@ func (fwd *fastDatapathForwarder) sendHeartbeat() {
DstPeer: fwd.remotePeer,
}
fwd.lock.RUnlock()
fwd.Forward(pk).Process(buf, dec, false)
if fop := fwd.Forward(pk); fop != nil {
fop.Process(buf, dec, false)
}
}
const (