Code clean-up. Fix a few warnings.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@784068 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java
index 57e5a90..7b79970 100644 (file)
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -212,7 +212,7 @@ public class NamingContextListener
             return;
         }
 
-        if (event.getType() == Lifecycle.START_EVENT) {
+        if (Lifecycle.START_EVENT.equals(event.getType())) {
 
             if (initialized)
                 return;
@@ -271,7 +271,7 @@ public class NamingContextListener
 
             initialized = true;
 
-        } else if (event.getType() == Lifecycle.STOP_EVENT) {
+        } else if (Lifecycle.STOP_EVENT.equals(event.getType())) {
 
             if (!initialized)
                 return;
@@ -1064,7 +1064,7 @@ public class NamingContextListener
         // 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);