mirror of
https://github.com/alibaba/canal.git
synced 2026-11-04 00:30:15 +08:00
Merge pull request #1065 from f-zhao/zhaofeng-branch
fix: fix NPE, 使用CanalServerWithManager时,开启GTID模式下,不传入masterPosition的情…
This commit is contained in:
@@ -35,12 +35,12 @@ import com.taobao.tddl.dbsync.binlog.LogEvent;
|
||||
|
||||
/**
|
||||
* 基于向mysql server复制binlog实现
|
||||
*
|
||||
*
|
||||
* <pre>
|
||||
* 1. 自身不控制mysql主备切换,由ha机制来控制. 比如接入tddl/cobar/自身心跳包成功率
|
||||
* 2. 切换机制
|
||||
* </pre>
|
||||
*
|
||||
*
|
||||
* @author jianghang 2012-6-21 下午04:06:32
|
||||
* @version 1.0.0
|
||||
*/
|
||||
@@ -202,7 +202,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
|
||||
|
||||
/**
|
||||
* 心跳信息
|
||||
*
|
||||
*
|
||||
* @author jianghang 2012-7-6 下午02:50:15
|
||||
* @version 1.0.0
|
||||
*/
|
||||
@@ -352,7 +352,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
|
||||
return logPosition.getPostion();
|
||||
}
|
||||
|
||||
if (StringUtils.isNotEmpty(masterPosition.getGtid())) {
|
||||
if (masterPosition!=null && StringUtils.isNotEmpty(masterPosition.getGtid())) {
|
||||
return masterPosition;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user