From commits-return-9041-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri May 05 17:55:41 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 79120 invoked from network); 5 May 2006 17:55:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 May 2006 17:55:41 -0000 Received: (qmail 14265 invoked by uid 500); 5 May 2006 17:55:39 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 14208 invoked by uid 500); 5 May 2006 17:55:39 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 14197 invoked by uid 99); 5 May 2006 17:55:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 May 2006 10:55:39 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 05 May 2006 10:55:38 -0700 Received: (qmail 78950 invoked by uid 65534); 5 May 2006 17:55:18 -0000 Message-ID: <20060505175518.78948.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r400123 - /directory/trunks/mina/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java Date: Fri, 05 May 2006 17:55:17 -0000 To: commits@directory.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jim Date: Fri May 5 10:55:15 2006 New Revision: 400123 URL: http://svn.apache.org/viewcvs?rev=400123&view=rev Log: Adding blocked endpoints should always be synchronized. So centralize where this is done. Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java?rev=400123&r1=400122&r2=400123&view=diff ============================================================================== --- directory/trunks/mina/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java (original) +++ directory/trunks/mina/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java Fri May 5 10:55:15 2006 @@ -57,11 +57,7 @@ for( int i = 0; i < addresses.length; i++ ) { InetAddress addr = addresses[ i ]; - if( addr == null ) - { - throw new NullPointerException( "addresses[" + i + ']' ); - } - blacklist.add( addr ); + block (addr, "addresses[" + i + ']' ); } } @@ -97,11 +93,19 @@ /** * Blocks the specified endpoint. */ - public synchronized void block( InetAddress address ) + public synchronized void block( InetAddress address , String error_string ) { if( address == null ) - throw new NullPointerException( "address" ); + throw new NullPointerException( error_string ); blacklist.add( address ); + } + + /** + * Blocks the specified endpoint. + */ + public synchronized void block( InetAddress address ) + { + block( address, "address" ); } /**