From af002f4e243051f396d670e868f6f842898abb82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=83=E9=94=8B?= Date: Thu, 15 Mar 2018 20:20:29 +0800 Subject: [PATCH] fixed bio socket --- .../canal/parse/driver/mysql/socket/BioSocketChannel.java | 6 +++--- .../otter/canal/example/AbstractCanalClientTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/BioSocketChannel.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/BioSocketChannel.java index c80c877d..65b55ed9 100644 --- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/BioSocketChannel.java +++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/BioSocketChannel.java @@ -2,12 +2,12 @@ package com.alibaba.otter.canal.parse.driver.mysql.socket; import java.io.IOException; import java.io.InputStream; -import java.io.InterruptedIOException; import java.io.OutputStream; import java.net.Socket; import java.net.SocketAddress; import java.net.SocketException; import java.net.SocketTimeoutException; +import java.nio.channels.ClosedByInterruptException; /** * 使用BIO进行dump @@ -56,7 +56,7 @@ public class BioSocketChannel implements SocketChannel { } } catch (SocketTimeoutException te) { if (Thread.interrupted()) { - throw new InterruptedIOException("Interrupted while reading."); + throw new ClosedByInterruptException("Interrupted while reading."); } } } @@ -81,7 +81,7 @@ public class BioSocketChannel implements SocketChannel { } } catch (SocketTimeoutException te) { if (Thread.interrupted()) { - throw new InterruptedIOException("Interrupted while reading."); + throw new ClosedByInterruptException(); } accTimeout += SO_TIMEOUT; } diff --git a/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java b/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java index 60ed8744..0f2360b3 100644 --- a/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java +++ b/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java @@ -56,7 +56,7 @@ public class AbstractCanalClientTest { context_format += "****************************************************" + SEP; row_format = SEP - + "----------------> binlog[{}:{}] , name[{},{}] , eventType : {} , executeTime : {}({}) , delay : {}ms" + + "----------------> binlog[{}:{}] , name[{},{}] , eventType : {} , executeTime : {}({}) , delay : {} ms" + SEP; transaction_format = SEP + "================> binlog[{}:{}] , executeTime : {}({}) , delay : {}ms" + SEP;