diff --git a/src/org/redkale/service/CacheSourceService.java b/src/org/redkale/service/CacheSourceService.java index f71a149fd..39db477d7 100644 --- a/src/org/redkale/service/CacheSourceService.java +++ b/src/org/redkale/service/CacheSourceService.java @@ -23,7 +23,7 @@ import org.redkale.util.*; * @author zhangjx */ @AutoLoad(false) -public class CacheSourceService implements CacheSource, Service { +public class CacheSourceService implements CacheSource, Service, AutoCloseable { @Resource(name = "APP_HOME") private File home; @@ -118,7 +118,8 @@ public class CacheSourceService implements CacheSource, Service { } } - public void close() { //给Application 关闭时调用 + @Override + public void close() throws Exception { //给Application 关闭时调用 destroy(null); } diff --git a/src/org/redkale/service/DataSourceService.java b/src/org/redkale/service/DataSourceService.java index 9814c9b0b..f1cfc34a8 100644 --- a/src/org/redkale/service/DataSourceService.java +++ b/src/org/redkale/service/DataSourceService.java @@ -19,7 +19,7 @@ import org.redkale.util.*; * @author zhangjx */ @AutoLoad(false) -public class DataSourceService implements DataSource, Service { +public class DataSourceService implements DataSource, Service, AutoCloseable { @Resource(name = "$") private DataSource source; @@ -319,4 +319,8 @@ public class DataSourceService implements DataSource, Service { return source.querySheet(clazz, selects, flipper, node); } + @Override + public void close() throws Exception { + source.getClass().getMethod("close").invoke(source); + } } diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java index 8830956a9..535d15502 100644 --- a/src/org/redkale/source/DataDefaultSource.java +++ b/src/org/redkale/source/DataDefaultSource.java @@ -25,7 +25,7 @@ import org.redkale.util.*; * @author zhangjx */ @SuppressWarnings("unchecked") -public final class DataDefaultSource implements DataSource, Function { +public final class DataDefaultSource implements DataSource, Function, AutoCloseable { public static final String DATASOURCE_CONFPATH = "DATASOURCE_CONFPATH"; @@ -278,7 +278,8 @@ public final class DataDefaultSource implements DataSource, Function