From 045029b4a97c0ea895938448df6b964b74264a0a Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Tue, 21 Mar 2017 11:55:57 +0800 Subject: [PATCH] --- src/org/redkale/convert/ext/TypeSimpledCoder.java | 2 +- src/org/redkale/net/http/HttpBaseServlet.java | 2 +- src/org/redkale/net/http/HttpPrepareServlet.java | 2 +- src/org/redkale/net/sncp/Sncp.java | 4 ++-- src/org/redkale/net/sncp/SncpDynServlet.java | 2 +- src/org/redkale/service/CacheSourceService.java | 4 ++-- src/org/redkale/source/PoolJdbcSource.java | 2 +- src/org/redkale/util/Creator.java | 2 +- src/org/redkale/util/Reproduce.java | 2 +- src/org/redkale/util/TypeToken.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/org/redkale/convert/ext/TypeSimpledCoder.java b/src/org/redkale/convert/ext/TypeSimpledCoder.java index a43b926e7..094d585d1 100644 --- a/src/org/redkale/convert/ext/TypeSimpledCoder.java +++ b/src/org/redkale/convert/ext/TypeSimpledCoder.java @@ -38,7 +38,7 @@ public class TypeSimpledCoder extends Simple if (str == null) return null; try { return Class.forName(str); - } catch (Exception e) { + } catch (Throwable e) { return null; } } diff --git a/src/org/redkale/net/http/HttpBaseServlet.java b/src/org/redkale/net/http/HttpBaseServlet.java index 2cdce1acc..8247ffe88 100644 --- a/src/org/redkale/net/http/HttpBaseServlet.java +++ b/src/org/redkale/net/http/HttpBaseServlet.java @@ -387,7 +387,7 @@ public abstract class HttpBaseServlet extends HttpServlet { try { Class.forName(newDynName.replace('/', '.')); newDynName += "_" + (++i); - } catch (Exception ex) { + } catch (Throwable ex) { break; } } diff --git a/src/org/redkale/net/http/HttpPrepareServlet.java b/src/org/redkale/net/http/HttpPrepareServlet.java index ee995eaa8..986d95e24 100644 --- a/src/org/redkale/net/http/HttpPrepareServlet.java +++ b/src/org/redkale/net/http/HttpPrepareServlet.java @@ -71,7 +71,7 @@ public class HttpPrepareServlet extends PrepareServlet) Class.forName(newDynName.replace('/', '.')); - } catch (Exception ex) { + } catch (Throwable ex) { } //------------------------------------------------------------------------------ ClassWriter cw = new ClassWriter(COMPUTE_FRAMES); @@ -942,7 +942,7 @@ public abstract class Sncp { s.set(rs, sb.toString()); } return rs; - } catch (Exception ex) { + } catch (Throwable ex) { } //------------------------------------------------------------------------------ ClassWriter cw = new ClassWriter(COMPUTE_FRAMES); diff --git a/src/org/redkale/net/sncp/SncpDynServlet.java b/src/org/redkale/net/sncp/SncpDynServlet.java index 521b51092..3be629242 100644 --- a/src/org/redkale/net/sncp/SncpDynServlet.java +++ b/src/org/redkale/net/sncp/SncpDynServlet.java @@ -231,7 +231,7 @@ public final class SncpDynServlet extends SncpServlet { try { Class.forName(newDynName.replace('/', '.')); newDynName += "_"; - } catch (Exception ex) { + } catch (Throwable ex) { break; } } diff --git a/src/org/redkale/service/CacheSourceService.java b/src/org/redkale/service/CacheSourceService.java index ff9856534..0c40b6125 100644 --- a/src/org/redkale/service/CacheSourceService.java +++ b/src/org/redkale/service/CacheSourceService.java @@ -82,7 +82,7 @@ public class CacheSourceService implem if (storeKeyStr != null && storeValueStr != null) { try { this.setStoreType(Class.forName(storeKeyStr), Class.forName(storeValueStr)); - } catch (Exception e) { + } catch (Throwable e) { logger.log(Level.SEVERE, self.getClass().getSimpleName() + " load key & value store class (" + storeKeyStr + ", " + storeValueStr + ") error", e); } } @@ -92,7 +92,7 @@ public class CacheSourceService implem if (expireHandlerClass != null) { try { this.expireHandler = (Consumer) Class.forName(expireHandlerClass).newInstance(); - } catch (Exception e) { + } catch (Throwable e) { logger.log(Level.SEVERE, self.getClass().getSimpleName() + " new expirehandler class (" + expireHandlerClass + ") instance error", e); } } diff --git a/src/org/redkale/source/PoolJdbcSource.java b/src/org/redkale/source/PoolJdbcSource.java index 1b8a8cdf6..99a66a8da 100644 --- a/src/org/redkale/source/PoolJdbcSource.java +++ b/src/org/redkale/source/PoolJdbcSource.java @@ -131,7 +131,7 @@ public class PoolJdbcSource { try { Class.forName("com.mysql.cj.jdbc.MysqlConnectionPoolDataSource"); source = "com.mysql.cj.jdbc.MysqlConnectionPoolDataSource"; - } catch (Exception e) { + } catch (Throwable e) { source = "com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource"; } break; diff --git a/src/org/redkale/util/Creator.java b/src/org/redkale/util/Creator.java index 61199a795..e6745a956 100644 --- a/src/org/redkale/util/Creator.java +++ b/src/org/redkale/util/Creator.java @@ -213,7 +213,7 @@ public interface Creator { } try { return (Creator) Class.forName(newDynName.replace('/', '.')).newInstance(); - } catch (Exception ex) { + } catch (Throwable ex) { } Constructor constructor0 = null; diff --git a/src/org/redkale/util/Reproduce.java b/src/org/redkale/util/Reproduce.java index 128b4b027..0f14ecb79 100644 --- a/src/org/redkale/util/Reproduce.java +++ b/src/org/redkale/util/Reproduce.java @@ -42,7 +42,7 @@ public interface Reproduce extends BiFunction { } try { return (Reproduce) Class.forName(newDynName.replace('/', '.')).newInstance(); - } catch (Exception ex) { + } catch (Throwable ex) { } // ------------------------------------------------------------------------------ ClassWriter cw = new ClassWriter(COMPUTE_FRAMES); diff --git a/src/org/redkale/util/TypeToken.java b/src/org/redkale/util/TypeToken.java index 6ed2e299f..ff7d5d2a2 100644 --- a/src/org/redkale/util/TypeToken.java +++ b/src/org/redkale/util/TypeToken.java @@ -183,7 +183,7 @@ public abstract class TypeToken { try { Class.forName(newDynName.replace('/', '.')); newDynName = TypeToken.class.getName().replace('.', '/') + "_Dyn" + Math.abs(System.nanoTime()); - } catch (Exception ex) { //异常说明类不存在 + } catch (Throwable ex) { //异常说明类不存在 break; } }