You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2019/03/27 05:36:00 UTC

[mina] branch mina-write-request updated: o Added some Javadoc o Simplified some code o Filtered the event message

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch mina-write-request
in repository https://gitbox.apache.org/repos/asf/mina.git


The following commit(s) were added to refs/heads/mina-write-request by this push:
     new b81942e  o Added some Javadoc o Simplified some code o Filtered the event message
b81942e is described below

commit b81942ef72582252768bc846de699544f9b05d8f
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Wed Mar 27 06:35:56 2019 +0100

    o Added some Javadoc
    o Simplified some code
    o Filtered the event message
---
 .../mina/filter/firewall/BlacklistFilter.java      | 37 ++++++++++++++++------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java b/mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
index effd6e2..8b99734 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
@@ -30,6 +30,7 @@ import org.apache.mina.core.filterchain.IoFilterAdapter;
 import org.apache.mina.core.session.IdleStatus;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.filter.FilterEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,6 +45,7 @@ public class BlacklistFilter extends IoFilterAdapter {
     /** The list of blocked addresses */
     private final List<Subnet> blacklist = new CopyOnWriteArrayList<Subnet>();
 
+    /** A logger for this class */ 
     private final static Logger LOGGER = LoggerFactory.getLogger(BlacklistFilter.class);
 
     /**
@@ -60,9 +62,8 @@ public class BlacklistFilter extends IoFilterAdapter {
 
         blacklist.clear();
 
-        for (int i = 0; i < addresses.length; i++) {
-            InetAddress addr = addresses[i];
-            block(addr);
+        for (InetAddress address:addresses) {
+            block(address);
         }
     }
 
@@ -178,36 +179,48 @@ public class BlacklistFilter extends IoFilterAdapter {
         blacklist.remove(subnet);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
-    public void sessionCreated(NextFilter nextFilter, IoSession session) {
+    public void event(NextFilter nextFilter, IoSession session, FilterEvent event) throws Exception {
         if (!isBlocked(session)) {
             // forward if not blocked
-            nextFilter.sessionCreated(session);
+            nextFilter.event(session, event);
         } else {
             blockSession(session);
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
-    public void sessionOpened(NextFilter nextFilter, IoSession session) throws Exception {
+    public void sessionCreated(NextFilter nextFilter, IoSession session) {
         if (!isBlocked(session)) {
             // forward if not blocked
-            nextFilter.sessionOpened(session);
+            nextFilter.sessionCreated(session);
         } else {
             blockSession(session);
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
-    public void sessionClosed(NextFilter nextFilter, IoSession session) throws Exception {
+    public void sessionOpened(NextFilter nextFilter, IoSession session) throws Exception {
         if (!isBlocked(session)) {
             // forward if not blocked
-            nextFilter.sessionClosed(session);
+            nextFilter.sessionOpened(session);
         } else {
             blockSession(session);
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void sessionIdle(NextFilter nextFilter, IoSession session, IdleStatus status) throws Exception {
         if (!isBlocked(session)) {
@@ -218,6 +231,9 @@ public class BlacklistFilter extends IoFilterAdapter {
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void messageReceived(NextFilter nextFilter, IoSession session, Object message) {
         if (!isBlocked(session)) {
@@ -228,6 +244,9 @@ public class BlacklistFilter extends IoFilterAdapter {
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void messageSent(NextFilter nextFilter, IoSession session, WriteRequest writeRequest) throws Exception {
         if (!isBlocked(session)) {