Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 16783 invoked from network); 12 Jun 2009 11:10:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Jun 2009 11:10:15 -0000 Received: (qmail 32300 invoked by uid 500); 12 Jun 2009 11:10:25 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 32232 invoked by uid 500); 12 Jun 2009 11:10:25 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 32221 invoked by uid 99); 12 Jun 2009 11:10:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2009 11:10:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2009 11:10:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B2212388896; Fri, 12 Jun 2009 11:10:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r784068 - /tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Date: Fri, 12 Jun 2009 11:10:03 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090612111003.4B2212388896@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Jun 12 11:10:02 2009 New Revision: 784068 URL: http://svn.apache.org/viewvc?rev=784068&view=rev Log: Code clean-up. Fix a few warnings. Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=784068&r1=784067&r2=784068&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Fri Jun 12 11:10:02 2009 @@ -212,7 +212,7 @@ return; } - if (event.getType() == Lifecycle.START_EVENT) { + if (Lifecycle.START_EVENT.equals(event.getType())) { if (initialized) return; @@ -271,7 +271,7 @@ initialized = true; - } else if (event.getType() == Lifecycle.STOP_EVENT) { + } else if (Lifecycle.STOP_EVENT.equals(event.getType())) { if (!initialized) return; @@ -1064,7 +1064,7 @@ // Create a reference to the resource. Reference ref = new ResourceLinkRef (resourceLink.getType(), resourceLink.getGlobal(), resourceLink.getFactory(), null); - Iterator i = resourceLink.listProperties(); + Iterator i = resourceLink.listProperties(); while (i.hasNext()) { String key = i.next().toString(); Object val = resourceLink.getProperty(key); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org