From 754974b85f96ae88b6e065424a0a91c8549358bc Mon Sep 17 00:00:00 2001 From: wentch <22250530@qq.com> Date: Mon, 21 Dec 2015 13:03:09 +0800 Subject: [PATCH] --- bin/shutdown.sh | 2 +- bin/start.sh | 2 +- src-plugin/org/redkale/net/socks/SocksServer.java | 2 ++ src/org/redkale/boot/ClassFilter.java | 5 +---- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bin/shutdown.sh b/bin/shutdown.sh index a14837207..51cf9d59d 100644 --- a/bin/shutdown.sh +++ b/bin/shutdown.sh @@ -1,6 +1,6 @@ #!/bin/sh -export LANG="zh_CN.UTF-8" +export LC_ALL="zh_CN.UTF-8" APP_HOME=`dirname "$0"` diff --git a/bin/start.sh b/bin/start.sh index eda730f20..e440517cf 100644 --- a/bin/start.sh +++ b/bin/start.sh @@ -4,7 +4,7 @@ ulimit -c unlimited ulimit -n 1024000 -export LANG="zh_CN.UTF-8" +export LC_ALL="zh_CN.UTF-8" APP_HOME=`dirname "$0"` diff --git a/src-plugin/org/redkale/net/socks/SocksServer.java b/src-plugin/org/redkale/net/socks/SocksServer.java index e3a5ed8c3..4799b39ed 100644 --- a/src-plugin/org/redkale/net/socks/SocksServer.java +++ b/src-plugin/org/redkale/net/socks/SocksServer.java @@ -42,6 +42,8 @@ public final class SocksServer extends Server { @Override @SuppressWarnings("unchecked") protected Context createContext() { + if (this.readTimeoutSecond < 1) this.readTimeoutSecond = 6; + if (this.writeTimeoutSecond < 1) this.writeTimeoutSecond = 6; final int port = this.address.getPort(); AtomicLong createBufferCounter = watch == null ? new AtomicLong() : watch.createWatchNumber("SOCKS_" + port + ".Buffer.creatCounter"); AtomicLong cycleBufferCounter = watch == null ? new AtomicLong() : watch.createWatchNumber("SOCKS_" + port + ".Buffer.cycleCounter"); diff --git a/src/org/redkale/boot/ClassFilter.java b/src/org/redkale/boot/ClassFilter.java index b24f4f0fd..62731ce56 100644 --- a/src/org/redkale/boot/ClassFilter.java +++ b/src/org/redkale/boot/ClassFilter.java @@ -348,9 +348,6 @@ public final class ClassFilter { urlfiles.add(url); } } - String selfpkg0 = ClassFilter.class.getPackage().getName(); - selfpkg0 = selfpkg0.substring(0, selfpkg0.lastIndexOf('.') + 1); - final String selfpkg = selfpkg0; List files = new ArrayList<>(); boolean debug = logger.isLoggable(Level.FINEST); StringBuilder debugstr = new StringBuilder(); @@ -371,7 +368,7 @@ public final class ClassFilter { String entryname = it.nextElement().getName().replace('/', '.'); if (entryname.endsWith(".class") && entryname.indexOf('$') < 0) { String classname = entryname.substring(0, entryname.length() - 6); - if (classname.startsWith("javax.") || classname.startsWith("com.sun.") || classname.startsWith(selfpkg) || classname.startsWith("com.mysql.")) continue; + if (classname.startsWith("javax.") || classname.startsWith("com.sun.") || classname.startsWith("com.mysql.")) continue; classes.add(classname); if (debug) debugstr.append(classname).append("\r\n"); for (final ClassFilter filter : filters) {