Fix a small number of warnings

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

diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java b/java/org/apache/catalina/ha/context/ReplicatedContext.java
index e0df86b..952170d 100644 (file)
--- a/java/org/apache/catalina/ha/context/ReplicatedContext.java
+++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java
@@ -172,9 +172,12 @@ public class ReplicatedContext extends StandardContext implements MapOwner {
                 return super.getAttribute(name);
         }
         
+        @SuppressWarnings("unchecked")
         @Override
         public Enumeration<String> getAttributeNames() {
-            return new MultiEnumeration<String>(new Enumeration[] {super.getAttributeNames(),new Enumerator<String>(tomcatAttributes.keySet(), true)});
+            return new MultiEnumeration<String>(new Enumeration[] {
+                    super.getAttributeNames(),
+                    new Enumerator<String>(tomcatAttributes.keySet(), true)});
         }
         
     }

diff --git a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
index e9a79a0..0bf06b7 100644 (file)
--- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
@@ -76,6 +76,7 @@ public class GlobalResourcesLifecycleListener
      *
      * @param event The event that has occurred
      */
+    @Override
     public void lifecycleEvent(LifecycleEvent event) {
 
         if (Lifecycle.START_EVENT.equals(event.getType())) {

diff --git a/java/org/apache/catalina/session/StandardSessionFacade.java b/java/org/apache/catalina/session/StandardSessionFacade.java
index 5bb83eb..e2ddc3e 100644 (file)
--- a/java/org/apache/catalina/session/StandardSessionFacade.java
+++ b/java/org/apache/catalina/session/StandardSessionFacade.java
@@ -23,7 +23,6 @@ import java.util.Enumeration;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
 
 
 /**
@@ -113,7 +112,7 @@ public class StandardSessionFacade
      */
     @Override
     @Deprecated
-    public HttpSessionContext getSessionContext() {
+    public javax.servlet.http.HttpSessionContext getSessionContext() {
         return session.getSessionContext();
     }