Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72137 invoked from network); 18 Jul 2004 22:05:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 18 Jul 2004 22:05:13 -0000 Received: (qmail 39057 invoked by uid 500); 18 Jul 2004 22:05:13 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 39010 invoked by uid 500); 18 Jul 2004 22:05:12 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 38997 invoked by uid 500); 18 Jul 2004 22:05:12 -0000 Delivered-To: apmail-incubator-geronimo-cvs@apache.org Received: (qmail 38994 invoked by uid 99); 18 Jul 2004 22:05:12 -0000 X-ASF-Spam-Status: No, hits=0.5 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.27.1) with SMTP; Sun, 18 Jul 2004 15:05:12 -0700 Received: (qmail 72120 invoked by uid 1712); 18 Jul 2004 22:05:11 -0000 Date: 18 Jul 2004 22:05:11 -0000 Message-ID: <20040718220511.72119.qmail@minotaur.apache.org> From: djencks@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx GBeanMBeanReference.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N djencks 2004/07/18 15:05:11 Modified: modules/kernel/src/java/org/apache/geronimo/gbean/jmx GBeanMBeanReference.java Log: Remove nulls from reference patterns before trying to match Revision Changes Path 1.11 +11 -2 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBeanReference.java Index: GBeanMBeanReference.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBeanReference.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- GBeanMBeanReference.java 24 Jun 2004 01:46:30 -0000 1.10 +++ GBeanMBeanReference.java 18 Jul 2004 22:05:11 -0000 1.11 @@ -24,6 +24,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; + import javax.management.AttributeNotFoundException; import javax.management.InstanceNotFoundException; import javax.management.MBeanServerNotification; @@ -130,9 +131,17 @@ if (!gmbean.isOffline()) { throw new IllegalStateException("Pattern set can not be modified while online"); } - if (patterns == null) { + if (patterns == null || patterns.isEmpty() || (patterns.size() == 1 && patterns.iterator().next() == null)) { this.patterns = Collections.EMPTY_SET; } else { + patterns = new HashSet(patterns); + for (Iterator iterator = this.patterns.iterator(); iterator.hasNext();) { + if (iterator.next() == null) { + iterator.remove(); + //there can be at most one null value in a set. + break; + } + } this.patterns = Collections.unmodifiableSet(patterns); } }