Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Received-SPF: pass (herse.apache.org: local policy)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
  s=s1024; d=yahoo.com;
  h=X-YMail-OSG:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID;
  b=hcEK6nfLLD5i9b4dr13cMPU8w9Kpj8pr4rvYXg+To5MJchCclrZLjlUMhNCo1G7JMIBowtsnkJFkBTM1I3FiC2tJRjUztZNB4oUEe4Fo1HTDcpOrQaWqs8owHCpj4OlyCZvGORLdRMm12dXrN3m3geayPfn4OgeU0UiNovGSME4=;
Date: Mon, 18 Dec 2006 07:46:08 -0800 (PST)
From: anita kulshreshtha <a_kulshre@yahoo.com>
Subject: Re: svn commit: r488106 -
 /geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java
To: dev@geronimo.apache.org
In-Reply-To: <20061218031843.15C281A981A@eris.apache.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Message-ID: <825405.44317.qm@web31708.mail.mud.yahoo.com>

   It would be nice if this was included in 2.0-M1. It will allow clean
shutdown of the server without changing all the log levels from WARN to
ERROR.

Thanks
Anita

--- dims@apache.org wrote:

> Author: dims
> Date: Sun Dec 17 19:18:42 2006
> New Revision: 488106
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=488106
> Log:
> prevent NPE if the hashmap is empty
> 
> Modified:
>    
>
geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java
> 
> Modified:
>
geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java
> URL:
>
http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java?view=diff&rev=488106&r1=488105&r2=488106
>
==============================================================================
> ---
>
geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java
> (original)
> +++
>
geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java
> Sun Dec 17 19:18:42 2006
> @@ -156,12 +156,13 @@
>       * @param abstractName the abstract name of the gbean to unbind
>       */
>      protected synchronized void removeBinding(AbstractName
> abstractName) {
> -        if (first(bindings).getKey().equals(abstractName)) {
> +        Map.Entry entry = first(bindings);
> +        if (entry != null && entry.getKey().equals(abstractName)) {
>              Object oldValue = bindings.remove(abstractName);
> -            Map.Entry newEntry = first(bindings);
> -            if (newEntry != null) {
> -                Object newAbstractName = newEntry.getValue();
> -                Object newValue = newEntry.getValue();
> +            entry = first(bindings);
> +            if (entry != null) {
> +                Object newAbstractName = entry.getValue();
> +                Object newValue = entry.getValue();
>                  try {
>                      context.rebind(name, newValue);
>                  } catch (NamingException e) {
> 
> 
> 


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com