From df1aa2b37984d7e4e93096b52947ac30e6663727 Mon Sep 17 00:00:00 2001 From: Redkale <8730487+redkale@users.noreply.github.com> Date: Sat, 11 Jan 2020 22:02:42 +0800 Subject: [PATCH] --- src/org/redkale/source/DataJdbcSource.java | 2 +- src/org/redkale/source/DataMemorySource.java | 2 +- src/org/redkale/source/EntityCache.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/redkale/source/DataJdbcSource.java b/src/org/redkale/source/DataJdbcSource.java index eb84bbc76..0962b7a41 100644 --- a/src/org/redkale/source/DataJdbcSource.java +++ b/src/org/redkale/source/DataJdbcSource.java @@ -601,7 +601,7 @@ public class DataJdbcSource extends DataSqlSource { ps.close(); return CompletableFuture.completedFuture(new Sheet<>(total, list)); } catch (SQLException e) { - if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(new Sheet<>()); + if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(new Sheet<>(0, new ArrayList())); CompletableFuture future = new CompletableFuture(); future.completeExceptionally(e); return future;//return CompletableFuture.failedFuture(e); diff --git a/src/org/redkale/source/DataMemorySource.java b/src/org/redkale/source/DataMemorySource.java index cfe268cb0..8fee91d50 100644 --- a/src/org/redkale/source/DataMemorySource.java +++ b/src/org/redkale/source/DataMemorySource.java @@ -150,7 +150,7 @@ public class DataMemorySource extends DataSqlSource { @Override protected CompletableFuture> querySheetDB(EntityInfo info, final boolean readcache, boolean needtotal, final boolean distinct, SelectColumn selects, Flipper flipper, FilterNode node) { - return CompletableFuture.completedFuture(new Sheet<>()); + return CompletableFuture.completedFuture(new Sheet<>(0, new ArrayList())); } } diff --git a/src/org/redkale/source/EntityCache.java b/src/org/redkale/source/EntityCache.java index 6cec2ab27..0087cfa9c 100644 --- a/src/org/redkale/source/EntityCache.java +++ b/src/org/redkale/source/EntityCache.java @@ -436,7 +436,7 @@ public final class EntityCache { if (distinct) stream = distinctStream(stream, keyattrs); total = stream.count(); } - if (needtotal && total == 0) return new Sheet<>(); + if (needtotal && total == 0) return new Sheet<>(0, new ArrayList()); Stream stream = this.list.stream(); if (filter != null) stream = stream.filter(filter); if (distinct) stream = distinctStream(stream, keyattrs);