Revision: f0f7097d20a4
Author:   Jean Deruelle <[email protected]>
Date:     Mon Aug 13 12:29:49 2012
Log:      Update Issue 146

Fix Regression on TestSuite and clean the code + license headers

http://code.google.com/p/sipservlets/source/detail?r=f0f7097d20a4

Modified:
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java /containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java /containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java /containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/sip/JBossCacheSipManager.java /containers/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/SipCacheListener.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SessionManagerUtil.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionKey.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionsUtilImpl.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/reinvite/CallForwardingB2BUAReInviteJunitTest.java /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/targeting/SipApplicationSessionKeyParsingTest.java

=======================================
--- /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java Tue Mar 27 08:02:55 2012 +++ /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -179,6 +179,7 @@
 //                             
sipNetworkInterfaceManager.getExtendedListeningPoints().next();
SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                        sipContext.getApplicationName(),
+                                       null,
                                        null);

                        sipApplicationSession =
=======================================
--- /containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java Tue Mar 27 08:02:55 2012 +++ /containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -179,6 +179,7 @@
 //                             
sipNetworkInterfaceManager.getExtendedListeningPoints().next();
SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                        sipContext.getApplicationName(),
+                                       null,
                                        null);

                        sipApplicationSession =
=======================================
--- /containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java Tue Mar 27 08:02:55 2012 +++ /containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/session/ConvergedSessionDelegate.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -179,6 +179,7 @@
 //                             
sipNetworkInterfaceManager.getExtendedListeningPoints().next();
SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                        sipContext.getApplicationName(),
+                                       null,
                                        null);

                        sipApplicationSession =
=======================================
--- /containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/sip/JBossCacheSipManager.java Tue Jul 10 08:51:54 2012 +++ /containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/sip/JBossCacheSipManager.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -2470,7 +2470,7 @@
                if(sipApplicationSessionImpl != null) {
                        applicationSessionKey = 
sipApplicationSessionImpl.getKey();
                } else {
- applicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(key.getApplicationName(), key.getApplicationSessionId()); + applicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(key.getApplicationName(), key.getApplicationSessionId(), null);
                }
                if(logger.isDebugEnabled()) {
logger.debug("load sip session " + key + ", create = " + create + " sip app session = "+ applicationSessionKey);
@@ -3525,7 +3525,7 @@
         */
        public void notifyRemoteSipApplicationSessionInvalidation(String 
realId) {
                // Remove the session from our local map
- SipApplicationSessionKey key = new SipApplicationSessionKey(realId, applicationName); + SipApplicationSessionKey key = new SipApplicationSessionKey(realId, applicationName, null); ClusteredSipApplicationSession<? extends OutgoingDistributableSessionData> session = (ClusteredSipApplicationSession)sipManagerDelegate
                                .removeSipApplicationSession(key);
                if (session == null) {
@@ -3693,7 +3693,7 @@
         */
        public void notifySipApplicationSessionLocalAttributeModification(
                        String realId) {
- SipApplicationSessionKey key = new SipApplicationSessionKey(realId, applicationName); + SipApplicationSessionKey key = new SipApplicationSessionKey(realId, applicationName, null); ClusteredSipApplicationSession<? extends OutgoingDistributableSessionData> session = (ClusteredSipApplicationSession) sipManagerDelegate
                                .getSipApplicationSession(key, false);
                if (session != null) {
@@ -3753,7 +3753,7 @@
                        String realId, String dataOwner, int distributedVersion,
                        long timestamp, DistributableSessionMetadata metadata) {
                boolean updated = true;
- SipApplicationSessionKey key = new SipApplicationSessionKey(realId, applicationName); + SipApplicationSessionKey key = new SipApplicationSessionKey(realId, applicationName, null);

ClusteredSipApplicationSession<? extends OutgoingDistributableSessionData> session = findLocalSipApplicationSession(
                                key, false);
=======================================
--- /containers/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/SipCacheListener.java Tue Mar 27 08:02:55 2012 +++ /containers/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/SipCacheListener.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -145,7 +145,7 @@

                if(isFqnSipApplicationSessionRootSized(size, isBuddy)) {
                        String sessId = getSipApplicationSessionIdFromFqn(fqn, 
isBuddy);
- SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessId, sipApplicationName); + SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessId, sipApplicationName, null); manager_.processRemoteSipApplicationSessionInvalidation(sipApplicationSessionKey);
                } else {
String sipAppSessId = getSipApplicationSessionIdFromFqn(fqn, isBuddy);
@@ -170,7 +170,7 @@
                if(isFqnSipApplicationSessionRootSized(size, isBuddy)) {
                        sessId = getSipApplicationSessionIdFromFqn(fqn, 
isBuddy);
attrKey = getSipApplicationSessionIdPojoKeyFromFqn(fqn, isBuddy); - SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessId, sipApplicationName); + SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessId, sipApplicationName, null); manager_.processRemoteSipApplicationSessionAttributeRemoval(sipApplicationSessionKey, attrKey);
                } else {
String sipAppSessId = getSipApplicationSessionIdFromFqn(fqn, isBuddy);
@@ -191,7 +191,7 @@
                 String sessId = null;
                if(isFqnSipApplicationSessionRootSized(size, isBuddy)) {
                        sessId = getSipApplicationSessionIdFromFqn(fqn, 
isBuddy);
- SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessId, sipApplicationName); + SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessId, sipApplicationName, null); manager_.processSipApplicationSessionLocalPojoModification(sipApplicationSessionKey);
                } else {
String sipAppSessId = getSipApplicationSessionIdFromFqn(fqn, isBuddy);
@@ -240,7 +240,7 @@
         String sessId = null;
         if(isFqnSipApplicationSessionRootSized(size, isBuddy)) {
                 sessId = getSipApplicationSessionIdFromFqn(fqn, isBuddy);
- SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessId, sipApplicationName); + SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessId, sipApplicationName, null); manager_.processSipApplicationSessionLocalPojoModification(sipApplicationSessionKey);
         } else {
String sipAppSessId = getSipApplicationSessionIdFromFqn(fqn, isBuddy);
@@ -275,7 +275,7 @@
                 }


- SipApplicationSessionKey key = new SipApplicationSessionKey(sessId, sipApplicationName); + SipApplicationSessionKey key = new SipApplicationSessionKey(sessId, sipApplicationName, null); ClusteredSipApplicationSession sipApplicationSession = manager_.findLocalSipApplicationSession(key, false);
          if (sipApplicationSession == null)
          {
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Fri Jul 27 05:50:42 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -1062,7 +1062,8 @@
                                        final SipManager sipManager = 
sipContext.getSipManager();
final SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                                        
sipSessionKey.getApplicationName(),
-                                                       
sipSessionKey.getApplicationSessionId());
+                                                       
sipSessionKey.getApplicationSessionId(),
+                                                       null);

                                        MobicentsSipSession sipSessionImpl = 
null;
                                        MobicentsSipApplicationSession 
sipApplicationSession = null;
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java Fri Jul 27 05:50:42 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -226,8 +226,8 @@
                }
SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                applicationName,
-                               null);
-               sipApplicationSessionKey.setAppGeneratedKey(appGeneratedKey);
+                               null,
+                               appGeneratedKey);
                return sipApplicationSessionKey;
        }

=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java Tue Oct 11 02:25:16 2011 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -233,7 +233,8 @@
                        }
final SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                        appName,
-                                       appId);
+                                       appId,
+                                       null);

                        MobicentsSipApplicationSession sipApplicationSession = 
null;
                        // needed only for failover (early) dialog recovery
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java Fri Jun 8 03:02:41 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -219,7 +219,8 @@
                final SipManager sipManager = sipContext.getSipManager();
final MobicentsSipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                applicationName,
-                               applicationId);
+                               applicationId,
+                               null);

                MobicentsSipSession tmpSipSession = null;
MobicentsSipApplicationSession sipApplicationSession = sipManager.getSipApplicationSession(sipApplicationSessionKey, false);
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SessionManagerUtil.java Thu Apr 28 11:18:14 2011 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SessionManagerUtil.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -110,13 +110,14 @@
         * @return the computed key
         * @throws NullPointerException if one of the two parameters is null
         */
- public static SipApplicationSessionKey getSipApplicationSessionKey(final String applicationName, final String id) { + public static SipApplicationSessionKey getSipApplicationSessionKey(final String applicationName, final String id, final String appGeneratedKey) {
                if(applicationName == null) {
throw new NullPointerException("the application name cannot be null for sip application session key creation");
                }
                return new SipApplicationSessionKey(
                                id,
-                               applicationName);
+                               applicationName,
+                               appGeneratedKey);
        }

        /**
@@ -143,11 +144,10 @@
                        appGeneratedKey = uuid;
                        uuid = leftover.substring(0, indexOfComma);
String applicationName = leftover.substring(indexOfComma + 1, leftover.length()); - sipApplicationSessionKey = getSipApplicationSessionKey(applicationName, uuid);
-                       
sipApplicationSessionKey.setAppGeneratedKey(appGeneratedKey);
+ sipApplicationSessionKey = getSipApplicationSessionKey(applicationName, uuid, appGeneratedKey);
                } else {
                        String applicationName = leftover;
- sipApplicationSessionKey = getSipApplicationSessionKey(applicationName, uuid); + sipApplicationSessionKey = getSipApplicationSessionKey(applicationName, uuid, null);
                }
                return sipApplicationSessionKey;
        }
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionKey.java Tue Aug 7 02:59:39 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionKey.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -42,8 +42,8 @@
        private static final long serialVersionUID = 1L;
private static final Logger logger = Logger.getLogger(SipApplicationSessionKey.class
                        .getCanonicalName());
-       private String uuid;
-       private String appGeneratedKey;
+       private final String uuid;
+       private final String appGeneratedKey;
        private final String applicationName;
        private String toString;

@@ -51,16 +51,31 @@
         * @param id
         * @param applicationName
         */
-       public SipApplicationSessionKey(String id, String applicationName) {
+ public SipApplicationSessionKey(String id, String applicationName, String appGeneratedKey) {
                super();
-               if(id == null) {
-                       // Issue 1551 : SipApplicationSessionKey is not unique
-                       this.uuid = "" + UUID.randomUUID();
-               } else {
-                       this.uuid = id;
-               }
+               this.appGeneratedKey = appGeneratedKey;
                this.applicationName = applicationName;
- toString = uuid + SessionManagerUtil.SESSION_KEY_SEPARATOR + applicationName; + // "While processing the initial request after selecting the application, the + // container MUST look for this annotated static method within the application. + // If found, the container MUST call the method to get the key and generate an
+               // application-session-id by appending some unique identifier
+               if(appGeneratedKey != null) {
+ // http://code.google.com/p/sipservlets/issues/detail?id=146 : @SipApplicationSessionKey usage can break replication + // Hash the appGeneratedKey to make sure it always resolve to the same uuid and reset the uuid with it.
+                       uuid = GenericUtils.hashString(appGeneratedKey);
+                       if(logger.isDebugEnabled()) {
+ logger.debug("uuid for appGeneratedKey " + appGeneratedKey + " set to " + uuid);
+                       }
+ toString = appGeneratedKey + SessionManagerUtil.SESSION_KEY_SEPARATOR + uuid + SessionManagerUtil.SESSION_KEY_SEPARATOR + applicationName;
+               } else {
+                       if(id == null) {
+                               // Issue 1551 : SipApplicationSessionKey is not 
unique
+                               this.uuid = "" + UUID.randomUUID();
+                       } else {
+                               this.uuid = id;
+                       }
+ toString = uuid + SessionManagerUtil.SESSION_KEY_SEPARATOR + applicationName;
+               }
        }
        /**
         * @return the Id
@@ -80,23 +95,9 @@
        public String getAppGeneratedKey() {
                return appGeneratedKey;
        }
-       public void setAppGeneratedKey(String appGeneratedKey) {
-               this.appGeneratedKey = appGeneratedKey;
- // "While processing the initial request after selecting the application, the - // container MUST look for this annotated static method within the application. - // If found, the container MUST call the method to get the key and generate an
-               // application-session-id by appending some unique identifier
-               if(appGeneratedKey != null) {
- // http://code.google.com/p/sipservlets/issues/detail?id=146 : @SipApplicationSessionKey usage can break replication - // Hash the appGeneratedKey to make sure it always resolve to the same uuid and reset the uuid with it. - // TODO Ideally this method should be removed and the logic included in the constructor
-                       uuid = GenericUtils.hashString(appGeneratedKey);
-                       if(logger.isDebugEnabled()) {
- logger.debug("uuid for appGeneratedKey " + appGeneratedKey + " set to " + uuid);
-                       }
- toString = appGeneratedKey + SessionManagerUtil.SESSION_KEY_SEPARATOR + uuid + SessionManagerUtil.SESSION_KEY_SEPARATOR + applicationName;
-               }
-       }
+//     public void setAppGeneratedKey(String appGeneratedKey) {
+//
+//     }

        /* (non-Javadoc)
         * @see java.lang.Object#hashCode()
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java Fri Jul 27 05:50:42 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -56,7 +56,8 @@
                        SipManager sipManager = sipContext.getSipManager();
final SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                        key.getApplicationName(),
-                                       key.getApplicationSessionId());
+                                       key.getApplicationSessionId(),
+                                       null);
MobicentsSipApplicationSession sipApplicationSession = sipManager.getSipApplicationSession(sipApplicationSessionKey, false); MobicentsSipSession sipSession = sipManager.getSipSession(key, false, sipFactoryImpl, sipApplicationSession);

=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionsUtilImpl.java Thu Sep 8 02:18:19 2011 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionsUtilImpl.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -100,8 +100,7 @@
                if(applicationSessionKey == null) {
                        throw new NullPointerException("the given key is null 
!");
                }
- SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(null, sipContext.getApplicationName());
-               
sipApplicationSessionKey.setAppGeneratedKey(applicationSessionKey);
+ SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(null, sipContext.getApplicationName(), applicationSessionKey);

MobicentsSipApplicationSession sipApplicationSession = sipContext.getSipManager().getSipApplicationSession(sipApplicationSessionKey, create);
                if(sipApplicationSession == null) {
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java Fri Aug 10 10:23:29 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java Mon Aug 13 12:29:49 2012
@@ -19,7 +19,6 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-
 package org.mobicents.servlet.sip.message;

 import gov.nist.javax.sip.header.HeaderFactoryExt;
@@ -251,6 +250,7 @@
//call id not needed anymore since the sipappsessionkey is not a callid anymore but a random uuid SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                sipContext.getApplicationName(),
+                               null,
                                null);
MobicentsSipApplicationSession sipApplicationSession = sipContext.getSipManager().getSipApplicationSession(
                                sipApplicationSessionKey, true);
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Fri Aug 10 10:23:29 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Mon Aug 13 12:29:49 2012
@@ -570,7 +570,7 @@
                                }
                                orphan = true;
                                sessionKey = 
SessionManagerUtil.getSipSessionKey(
- SessionManagerUtil.getSipApplicationSessionKey(applicationName, getAppSessionId()).getId(), + SessionManagerUtil.getSipApplicationSessionKey(applicationName, getAppSessionId(), null).getId(),
                                                applicationName, message, 
false);
                        }
                }
@@ -579,7 +579,7 @@
//call id not needed anymore since the sipappsessionkey is not a callid anymore but a random uuid final SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                        applicationName,
-                                       sessionKey.getApplicationSessionId());
+                                       sessionKey.getApplicationSessionId(), 
null);
MobicentsSipApplicationSession applicationSession = sipContext.getSipManager().getSipApplicationSession(sipApplicationSessionKey, create);
                        if(applicationSession != null) {
// application session can be null if create is false and it is an orphan request
@@ -1085,7 +1085,7 @@
                if(sipSession == null && sessionKey != null) {
                        final String applicationName = 
sessionKey.getApplicationName();
final SipContext sipContext = sipFactoryImpl.getSipApplicationDispatcher().findSipApplication(applicationName); - SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessionKey.getApplicationSessionId(), sessionKey.getApplicationName()); + SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(sessionKey.getApplicationSessionId(), sessionKey.getApplicationName(), null); MobicentsSipApplicationSession sipApplicationSession = sipContext.getSipManager().getSipApplicationSession(sipApplicationSessionKey, false); sipSession = sipContext.getSipManager().getSipSession(sessionKey, false, sipFactoryImpl, sipApplicationSession);
                }
=======================================
--- /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/reinvite/CallForwardingB2BUAReInviteJunitTest.java Thu Apr 28 11:18:14 2011 +++ /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/reinvite/CallForwardingB2BUAReInviteJunitTest.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
=======================================
--- /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/targeting/SipApplicationSessionKeyParsingTest.java Thu Apr 28 11:18:14 2011 +++ /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/targeting/SipApplicationSessionKeyParsingTest.java Mon Aug 13 12:29:49 2012
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -19,18 +19,15 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-
 package org.mobicents.servlet.sip.testsuite.targeting;

 import java.text.ParseException;

+import junit.framework.TestCase;
 import nl.jqno.equalsverifier.EqualsVerifier;

 import org.mobicents.servlet.sip.core.session.SessionManagerUtil;
 import org.mobicents.servlet.sip.core.session.SipApplicationSessionKey;
-import org.mobicents.servlet.sip.core.session.SipSessionKey;
-
-import junit.framework.TestCase;

 /**
  * Non Regression Test for Issue 2423
@@ -63,7 +60,7 @@


public void testSipApplicationSessionKeyAndParsing() throws ParseException { - SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(null, "ApplicationNameTest"); + SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(null, "ApplicationNameTest", null); String sipApplicationSessionKeyStringified = sipApplicationSessionKey.toString();

                SipApplicationSessionKey sipApplicationSessionKeyParsed =
@@ -74,10 +71,9 @@
assertEquals(sipApplicationSessionKey.toString(), sipApplicationSessionKeyParsed.toString());
        }

- public void testSipApplicationSessionKeyGeneratedAndParsing() throws ParseException { - SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(null, "ApplicationNameTest"); + public void testSipApplicationSessionKeyGeneratedAndParsing() throws ParseException {
                String appGeneratedKey = "myGeneratedKey";
-               sipApplicationSessionKey.setAppGeneratedKey(appGeneratedKey);
+ SipApplicationSessionKey sipApplicationSessionKey = new SipApplicationSessionKey(null, "ApplicationNameTest", appGeneratedKey); String sipApplicationSessionKeyStringified = sipApplicationSessionKey.toString();

                SipApplicationSessionKey sipApplicationSessionKeyParsed =
@@ -88,8 +84,7 @@
assertEquals(sipApplicationSessionKey.toString(), sipApplicationSessionKeyParsed.toString()); assertTrue(sipApplicationSessionKey.toString().startsWith(appGeneratedKey));

- SipApplicationSessionKey sipApplicationSessionKeyDifferentAppGeneratedKey = new SipApplicationSessionKey(sipApplicationSessionKeyParsed.getId(), "ApplicationNameTest"); - sipApplicationSessionKeyDifferentAppGeneratedKey.setAppGeneratedKey("myDifferentGeneratedKey"); + SipApplicationSessionKey sipApplicationSessionKeyDifferentAppGeneratedKey = new SipApplicationSessionKey(sipApplicationSessionKeyParsed.getId(), "ApplicationNameTest", "myDifferentGeneratedKey");
                
System.out.println(sipApplicationSessionKeyDifferentAppGeneratedKey);
assertFalse(sipApplicationSessionKeyDifferentAppGeneratedKey.toString().equals(sipApplicationSessionKeyParsed.toString()));
        }

Reply via email to