chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed format

Browse Source
This commit is contained in:
agapple
2017-04-01 21:04:21 +08:00
parent b2a5f482ee
commit 2e3796cb07
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/alibaba/otter/canal/common/utils/JsonUtils.java
View File

@@ -90,7 +90,7 @@ public class JsonUtils {
@Override @Override
public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features)
throws IOException { throws IOException {
if (object == null) { if (object == null) {
serializer.writeNull(); serializer.writeNull();
return; return;

6
deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java
View File

@@ -49,7 +49,7 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1, private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1,
new NamedThreadFactory("canal-instance-scan")); new NamedThreadFactory("canal-instance-scan"));
private volatile boolean isFirst = true; private volatile boolean isFirst = true;
public void start() { public void start() {
super.start(); super.start();
@@ -60,7 +60,9 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
public void run() { public void run() {
try { try {
scan(); scan();
if (isFirst) isFirst = false; if (isFirst) {
isFirst = false;
}
} catch (Throwable e) { } catch (Throwable e) {
logger.error("scan failed", e); logger.error("scan failed", e);
} }