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<String> i = resourceLink.listProperties();
while (i.hasNext()) {
String key = i.next().toString();
Object val = resourceLink.getProperty(key);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
