Merge branch 'develop-tmp'

# Conflicts:
#	kafka-client/pom.xml
#	kafka/pom.xml
This commit is contained in:
machey
2018-08-23 23:59:20 +08:00
36 changed files with 136 additions and 848 deletions

View File

@@ -45,7 +45,7 @@ public class MappingConfigLoader {
continue;
}
c = c.trim();
if (c.startsWith("#")) {
if (c.equals("") || c.startsWith("#")) {
continue;
}