Browse Source

修改withoutNetty的bug

rewerma 7 years ago
parent
commit
e4cde2f6a1

+ 1 - 1
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java

@@ -98,7 +98,7 @@ public class CanalController {
         embededCanalServer = CanalServerWithEmbedded.instance();
         embededCanalServer.setCanalInstanceGenerator(instanceGenerator);// 设置自定义的instanceGenerator
         String canalWithoutNetty = getProperty(properties, CanalConstants.CANAL_WITHOUT_NETTY);
-        if (canalWithoutNetty == null || "true".equals(canalWithoutNetty)) {
+        if (canalWithoutNetty == null || "false".equals(canalWithoutNetty)) {
             canalServer = CanalServerWithNetty.instance();
             canalServer.setIp(ip);
             canalServer.setPort(port);

+ 1 - 1
kafka/src/main/java/com/alibaba/otter/canal/kafka/CanalServerStarter.java

@@ -30,7 +30,7 @@ public class CanalServerStarter {
             Properties properties = new Properties();
             if (conf.startsWith(CLASSPATH_URL_PREFIX)) {
                 conf = StringUtils.substringAfter(conf, CLASSPATH_URL_PREFIX);
-                properties.load(com.alibaba.otter.canal.deployer.CanalLauncher.class.getClassLoader().getResourceAsStream(conf));
+                properties.load(CanalLauncher.class.getClassLoader().getResourceAsStream(conf));
             } else {
                 properties.load(new FileInputStream(conf));
             }