diff --git a/aio-core/pom.xml b/aio-core/pom.xml index e1cfc917d46a5340c50bec92baf83e866a1aa1cf..43030ecfcd11360178c368f002996e55304c4a3e 100644 --- a/aio-core/pom.xml +++ b/aio-core/pom.xml @@ -20,7 +20,7 @@ org.smartboot.socket smart-socket-parent - 1.5.0 + 1.5.1 ../smart-socket-parent diff --git a/aio-core/src/main/java/org/smartboot/socket/transport/IoServerConfig.java b/aio-core/src/main/java/org/smartboot/socket/transport/IoServerConfig.java index b53c905f8da58c972519464d628f790e06a046c4..c19c8e90841aa02826b8887cf1d24984661337d5 100644 --- a/aio-core/src/main/java/org/smartboot/socket/transport/IoServerConfig.java +++ b/aio-core/src/main/java/org/smartboot/socket/transport/IoServerConfig.java @@ -39,7 +39,7 @@ final class IoServerConfig { /** * 当前smart-socket版本号 */ - public static final String VERSION = "v1.5.0"; + public static final String VERSION = "v1.5.1"; /** * 消息体缓存大小,字节 diff --git a/aio-pro/pom.xml b/aio-pro/pom.xml index 157b35d8984f96655fb19461d3bcd9432e47307f..7f6fba40c5bacd9b27b43bae0786fa9e61192166 100644 --- a/aio-pro/pom.xml +++ b/aio-pro/pom.xml @@ -20,7 +20,7 @@ org.smartboot.socket smart-socket-parent - 1.5.0 + 1.5.1 ../smart-socket-parent diff --git a/aio-pro/src/main/java/org/smartboot/socket/transport/UdpBootstrap.java b/aio-pro/src/main/java/org/smartboot/socket/transport/UdpBootstrap.java index 6a6aea4c8f9697b3042c0baecb5a5ecece976dd3..2fb4a9ed3e2d9fae5484ebbd25cf36ef1bad19ac 100644 --- a/aio-pro/src/main/java/org/smartboot/socket/transport/UdpBootstrap.java +++ b/aio-pro/src/main/java/org/smartboot/socket/transport/UdpBootstrap.java @@ -12,6 +12,7 @@ package org.smartboot.socket.transport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.smartboot.socket.MessageProcessor; +import org.smartboot.socket.NetMonitor; import org.smartboot.socket.Protocol; import org.smartboot.socket.StateMachineEnum; import org.smartboot.socket.buffer.BufferPage; @@ -201,8 +202,11 @@ public class UdpBootstrap { buffer.flip(); UdpAioSession aioSession = channel.createAndCacheSession(remote); - config.getMonitor().beforeRead(aioSession); - config.getMonitor().afterRead(aioSession, buffer.remaining()); + NetMonitor netMonitor = config.getMonitor(); + if(netMonitor != null){ + netMonitor.beforeRead(aioSession); + netMonitor.afterRead(aioSession, buffer.remaining()); + } Request request; //解码 try { diff --git a/aio-pro/src/main/java/org/smartboot/socket/transport/UdpDispatcher.java b/aio-pro/src/main/java/org/smartboot/socket/transport/UdpDispatcher.java index bc1f893d77bb0c22fe2aeb3f1640e646e4bae0ea..133fe1a3a9dc56601c09f945d946724ecd14e7a0 100644 --- a/aio-pro/src/main/java/org/smartboot/socket/transport/UdpDispatcher.java +++ b/aio-pro/src/main/java/org/smartboot/socket/transport/UdpDispatcher.java @@ -34,8 +34,8 @@ class UdpDispatcher implements Runnable { @Override public void run() { - try { - while (true) { + while (true) { + try { RequestTask unit = taskQueue.take(); if (unit == EXECUTE_TASK_OR_SHUTDOWN) { LOGGER.info("shutdown thread:{}", Thread.currentThread()); @@ -43,9 +43,11 @@ class UdpDispatcher implements Runnable { } processor.process(unit.session, unit.request); unit.session.writeBuffer().flush(); + } catch (InterruptedException e) { + LOGGER.info("InterruptedException", e); + } catch (Exception e) { + LOGGER.error(e.getClass().getName(), e); } - } catch (InterruptedException e) { - LOGGER.info("InterruptedException", e); } } diff --git a/example/pom.xml b/example/pom.xml index 3fc28166ec65026aa79b894a93a1ab7b30f71e40..dc9703889097b768468beacb3e8a3dc367060f3c 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -32,12 +32,12 @@ org.smartboot.socket aio-pro - 1.5.0 + 1.5.1 org.smartboot.socket aio-core - 1.5.0 + 1.5.1 org.apache.commons @@ -52,7 +52,7 @@ org.smartboot.aio aio-enhance - 1.0.1-SNAPSHOT + 1.0.2 diff --git a/pom.xml b/pom.xml index fd3aadf9459844f6b66601a3eab66869fcd257f8..3f3278e8aaa66c479f4624332cc31070641d9c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.smartboot.socket smart-socket-parent - 1.5.0 + 1.5.1 2.6 diff --git a/smart-socket-parent/pom.xml b/smart-socket-parent/pom.xml index 690a4a0596e4e626476476fea0ff6cd9fd9eb984..569c26e663adb62b3a76788df401ad268445721c 100644 --- a/smart-socket-parent/pom.xml +++ b/smart-socket-parent/pom.xml @@ -15,14 +15,14 @@ 4.0.0 org.smartboot.socket smart-socket-parent - 1.5.0 + 1.5.1 pom UTF-8 1.7.29 - 1.5.0 + 1.5.1