From 180f201dc015f92dd5f575a140051ce032bba604 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 24 Jul 2017 17:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA<services>?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=94=E5=85=B6=E4=B8=8B=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?service=E6=97=B6=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E6=89=80?=
 =?UTF-8?q?=E6=9C=89service=E5=AE=9E=E4=BE=8B=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/boot/ClassFilter.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/org/redkale/boot/ClassFilter.java b/src/org/redkale/boot/ClassFilter.java
index a177bbe73..8a04f51db 100644
--- a/src/org/redkale/boot/ClassFilter.java
+++ b/src/org/redkale/boot/ClassFilter.java
@@ -99,7 +99,11 @@ public final class ClassFilter<T> {
      * @return Set&lt;FilterEntry&lt;T&gt;&gt;
      */
     public final Set<FilterEntry<T>> getFilterEntrys() {
-        return entrys;
+        HashSet<FilterEntry<T>> set = new HashSet<>();
+        set.addAll(entrys);
+        if (ors != null) ors.forEach(f -> set.addAll(f.getFilterEntrys()));
+        if (ands != null) ands.forEach(f -> set.addAll(f.getFilterEntrys()));
+        return set;
     }
 
     /**
@@ -108,7 +112,11 @@ public final class ClassFilter<T> {
      * @return Set&lt;FilterEntry&lt;T&gt;&gt;
      */
     public final Set<FilterEntry<T>> getFilterExpectEntrys() {
-        return expectEntrys;
+        HashSet<FilterEntry<T>> set = new HashSet<>();
+        set.addAll(entrys);
+        if (ors != null) ors.forEach(f -> set.addAll(f.getFilterExpectEntrys()));
+        if (ands != null) ands.forEach(f -> set.addAll(f.getFilterExpectEntrys()));
+        return set;
     }
 
     /**
@@ -118,8 +126,8 @@ public final class ClassFilter<T> {
      */
     public final Set<FilterEntry<T>> getAllFilterEntrys() {
         HashSet<FilterEntry<T>> rs = new HashSet<>();
-        rs.addAll(entrys);
-        rs.addAll(expectEntrys);
+        rs.addAll(getFilterEntrys());
+        rs.addAll(getFilterExpectEntrys());
         return rs;
     }