[mobicents commit] r5156 - Fix for Issue 613.

Mon, 23 Mar 2009 04:11:31 -0700 


Author: jean.deruelle
Date: Mon Mar 23 04:04:23 2009
New Revision: 5156

Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedSessionFacade.java trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedStandardSession.java trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedAttributeBasedClusteredSession.java trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedFieldBasedClusteredSession.java trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedSessionBasedClusteredSession.java 

Log:
Fix for Issue 613.
Modified: trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedSessionFacade.java 
==============================================================================
--- trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedSessionFacade.java (original) +++ trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedSessionFacade.java Mon Mar 23 04:04:23 2009 
@@ -19,9 +19,7 @@
 import java.util.Enumeration;

 import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionContext;
-import javax.servlet.sip.ConvergedHttpSession;
 import javax.servlet.sip.SipApplicationSession;

 /**
@@ -30,13 +28,13 @@
  * @author Jean Deruelle
  *
  */
-public class ConvergedSessionFacade implements HttpSession, javax.servlet.sip.ConvergedHttpSession { 
-       javax.servlet.sip.ConvergedHttpSession session;
+public class ConvergedSessionFacade implements ConvergedSession {
+       ConvergedSession session;

     /**
      * Construct a new session facade.
      */
-    public ConvergedSessionFacade(ConvergedHttpSession session) {
+    public ConvergedSessionFacade(ConvergedSession session) {
         super();
         this.session = session;
     }
@@ -200,5 +198,13 @@
         */
        public SipApplicationSession getApplicationSession() {
                return session.getApplicationSession();
+       }
+
+ public MobicentsSipApplicationSession getApplicationSession(boolean create) { 
+               return session.getApplicationSession(create);
+       }
+
+       public boolean isValid() {
+               return session.isValid();
        }
 }
Modified: trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedStandardSession.java 
==============================================================================
--- trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedStandardSession.java (original) +++ trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedStandardSession.java Mon Mar 23 04:04:23 2009 
@@ -20,11 +20,9 @@
 import java.security.PrivilegedAction;

 import javax.servlet.http.HttpSession;
-import javax.servlet.sip.ConvergedHttpSession;
 import javax.servlet.sip.SipApplicationSession;

 import org.apache.catalina.security.SecurityUtil;
-import org.mobicents.servlet.sip.core.SipNetworkInterfaceManager;

 /**
  * Extension of the Tomcat StandardSession class so that applications
@@ -57,7 +55,7 @@
        public HttpSession getSession() {
         if (facade == null){
             if (SecurityUtil.isPackageProtectionEnabled()){
-                final ConvergedHttpSession fsession = this;
+                final ConvergedSession fsession = this;
facade = (ConvergedSessionFacade)AccessController.doPrivileged(new PrivilegedAction<ConvergedSessionFacade>(){ 
                     public ConvergedSessionFacade run(){
                         return new ConvergedSessionFacade(fsession);
Modified: trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedAttributeBasedClusteredSession.java 
==============================================================================
--- trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedAttributeBasedClusteredSession.java (original) +++ trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedAttributeBasedClusteredSession.java Mon Mar 23 04:04:23 2009 
@@ -20,11 +20,9 @@
 import java.security.PrivilegedAction;

 import javax.servlet.http.HttpSession;
-import javax.servlet.sip.ConvergedHttpSession;
 import javax.servlet.sip.SipApplicationSession;

 import org.apache.catalina.security.SecurityUtil;
-import org.mobicents.servlet.sip.core.SipNetworkInterfaceManager;
 import org.mobicents.servlet.sip.core.session.ConvergedSession;
 import org.mobicents.servlet.sip.core.session.ConvergedSessionDelegate;
 import org.mobicents.servlet.sip.core.session.ConvergedSessionFacade;
@@ -58,7 +56,7 @@
        public HttpSession getSession() {
         if (facade == null){
             if (SecurityUtil.isPackageProtectionEnabled()){
-                final ConvergedHttpSession fsession = this;
+                final ConvergedSession fsession = this;
facade = (ConvergedSessionFacade)AccessController.doPrivileged(new PrivilegedAction<ConvergedSessionFacade>(){ 
                     public ConvergedSessionFacade run(){
                         return new ConvergedSessionFacade(fsession);
Modified: trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedFieldBasedClusteredSession.java 
==============================================================================
--- trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedFieldBasedClusteredSession.java (original) +++ trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedFieldBasedClusteredSession.java Mon Mar 23 04:04:23 2009 
@@ -20,11 +20,9 @@
 import java.security.PrivilegedAction;

 import javax.servlet.http.HttpSession;
-import javax.servlet.sip.ConvergedHttpSession;
 import javax.servlet.sip.SipApplicationSession;

 import org.apache.catalina.security.SecurityUtil;
-import org.mobicents.servlet.sip.core.SipNetworkInterfaceManager;
 import org.mobicents.servlet.sip.core.session.ConvergedSession;
 import org.mobicents.servlet.sip.core.session.ConvergedSessionDelegate;
 import org.mobicents.servlet.sip.core.session.ConvergedSessionFacade;
@@ -63,7 +61,7 @@
        public HttpSession getSession() {
         if (facade == null){
             if (SecurityUtil.isPackageProtectionEnabled()){
-                final ConvergedHttpSession fsession = this;
+                final ConvergedSession fsession = this;
facade = (ConvergedSessionFacade)AccessController.doPrivileged(new PrivilegedAction<ConvergedSessionFacade>(){ 
                     public ConvergedSessionFacade run(){
                         return new ConvergedSessionFacade(fsession);
Modified: trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedSessionBasedClusteredSession.java 
==============================================================================
--- trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedSessionBasedClusteredSession.java (original) +++ trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedSessionBasedClusteredSession.java Mon Mar 23 04:04:23 2009 
@@ -20,11 +20,9 @@
 import java.security.PrivilegedAction;

 import javax.servlet.http.HttpSession;
-import javax.servlet.sip.ConvergedHttpSession;
 import javax.servlet.sip.SipApplicationSession;

 import org.apache.catalina.security.SecurityUtil;
-import org.mobicents.servlet.sip.core.SipNetworkInterfaceManager;
 import org.mobicents.servlet.sip.core.session.ConvergedSession;
 import org.mobicents.servlet.sip.core.session.ConvergedSessionDelegate;
 import org.mobicents.servlet.sip.core.session.ConvergedSessionFacade;
@@ -63,7 +61,7 @@
        public HttpSession getSession() {
         if (facade == null){
             if (SecurityUtil.isPackageProtectionEnabled()){
-                final ConvergedHttpSession fsession = this;
+                final ConvergedSession fsession = this;
facade = (ConvergedSessionFacade)AccessController.doPrivileged(new PrivilegedAction<ConvergedSessionFacade>(){ 
                     public ConvergedSessionFacade run(){
                         return new ConvergedSessionFacade(fsession);

Reply via email to