tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1142655 - in /tomcat/trunk/java/org/apache/catalina: ha/context/ReplicatedContext.java mbeans/GlobalResourcesLifecycleListener.java session/StandardSessionFacade.java
Date Mon, 04 Jul 2011 13:28:12 GMT
Author: markt
Date: Mon Jul  4 13:28:11 2011
New Revision: 1142655

URL: http://svn.apache.org/viewvc?rev=1142655&view=rev
Log:
Fix a small number of warnings

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
    tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
    tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1142655&r1=1142654&r2=1142655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Mon Jul  4 13:28:11
2011
@@ -172,9 +172,12 @@ public class ReplicatedContext extends S
                 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)});
         }
         
     }

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?rev=1142655&r1=1142654&r2=1142655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java Mon
Jul  4 13:28:11 2011
@@ -76,6 +76,7 @@ public class GlobalResourcesLifecycleLis
      *
      * @param event The event that has occurred
      */
+    @Override
     public void lifecycleEvent(LifecycleEvent event) {
 
         if (Lifecycle.START_EVENT.equals(event.getType())) {

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java?rev=1142655&r1=1142654&r2=1142655&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java Mon Jul  4 13:28:11
2011
@@ -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();
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message