Revert "修复测试类报错 (#4516)"

This reverts commit d899981354.
This commit is contained in:
rewerma
2022-12-06 16:41:17 +08:00
committed by GitHub
parent d899981354
commit f3bb0dd18d
89 changed files with 4470 additions and 1105 deletions

View File

@@ -171,7 +171,7 @@ public class FileMixedMetaManager extends MemoryMetaManager implements CanalMeta
return null;
}
String json = FileUtils.readFileToString(dataFile, charset);
String json = FileUtils.readFileToString(dataFile, charset.name());
return JsonUtils.unmarshalFromString(json, FileMetaInstanceData.class);
} catch (IOException e) {
throw new CanalMetaManagerException(e);
@@ -209,11 +209,7 @@ public class FileMixedMetaManager extends MemoryMetaManager implements CanalMeta
data.setClientDatas(clientDatas);
}
//fixed issue https://github.com/alibaba/canal/issues/4312
//客户端数据为空时不覆盖文件内容 (适合单客户端)
if(data.getClientDatas().isEmpty()){
return;
}
String json = JsonUtils.marshalToString(data);
try {
FileUtils.writeStringToFile(dataFile, json);