From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 16 Jan 2011 15:49:50 +0000 (+0000)
Subject: Avoid deprecation warning without disabling warnings for the whole class
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=440b518948d0c9d897b2e87fe9392dea78f5ac44;p=tomcat7.0

Avoid deprecation warning without disabling warnings for the whole class

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

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 641370ecf..72063b7c5 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -43,7 +43,6 @@ import javax.servlet.http.HttpSessionActivationListener;
 import javax.servlet.http.HttpSessionAttributeListener;
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionContext;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
@@ -274,7 +273,8 @@ public class StandardSession implements HttpSession, Session, Serializable {
      * The HTTP session context associated with this session.
      */
     @Deprecated
-    protected static volatile HttpSessionContext sessionContext = null;
+    protected static volatile
+            javax.servlet.http.HttpSessionContext sessionContext = null;
 
 
     /**
@@ -1137,7 +1137,7 @@ public class StandardSession implements HttpSession, Session, Serializable {
      */
     @Override
     @Deprecated
-    public HttpSessionContext getSessionContext() {
+    public javax.servlet.http.HttpSessionContext getSessionContext() {
 
         if (sessionContext == null)
             sessionContext = new StandardSessionContext();
@@ -1860,7 +1860,8 @@ public class StandardSession implements HttpSession, Session, Serializable {
  */
 
 @Deprecated
-final class StandardSessionContext implements HttpSessionContext {
+final class StandardSessionContext
+        implements javax.servlet.http.HttpSessionContext {
 
 
     protected HashMap<?,String> dummy = new HashMap<String,String>();