master moved from f8fe7e1b1ee4 to 08cba7998a83

2 new revisions:

Revision: 47debc8887c0
Author:   Jean Deruelle <[email protected]>
Date:     Wed Apr 23 13:26:04 2014 UTC
Log:      typo fix...
http://code.google.com/p/sipservlets/source/detail?r=47debc8887c0

Revision: 08cba7998a83
Author:   Jean Deruelle <[email protected]>
Date:     Wed Apr 23 16:53:22 2014 UTC
Log:      Fixes Issue 265...
http://code.google.com/p/sipservlets/source/detail?r=08cba7998a83

==============================================================================
Revision: 47debc8887c0
Author:   Jean Deruelle <[email protected]>
Date:     Wed Apr 23 13:26:04 2014 UTC
Log:      typo fix

(cherry picked from commit 1103a0d1957d845b431cb8df60dbbd62f209bf02)

Conflicts:
containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java

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

Modified:
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java

=======================================
--- /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Tue Apr 1 12:35:32 2014 UTC +++ /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Apr 23 13:26:04 2014 UTC
@@ -1066,7 +1066,7 @@
                                                } else 
if(logger.isDebugEnabled()) {
                                                        if(!isContainerManaged) 
{
logger.debug("not acquiring sipApplicationSession=" + sipApplicationSession + - " since application specified the container shouldn't managed it "); + " since application specified the container shouldn't manage it ");
                                                        } else {
logger.debug("not acquiring sipApplicationSession=" + sipApplicationSession + " since it is present in our local thread of accessed sip application sessions ");
=======================================
--- /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Tue Apr 1 12:35:32 2014 UTC +++ /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Apr 23 13:26:04 2014 UTC
@@ -1256,11 +1256,10 @@
                                                } else 
if(logger.isDebugEnabled()) {
                                                        if(!isContainerManaged) 
{
logger.debug("not acquiring sipApplicationSession=" + sipApplicationSession + - " since application specified the container shouldn't managed it "); + " since application specified the container shouldn't manage it ");
                                                        } else {
logger.debug("not acquiring sipApplicationSession=" + sipApplicationSession + " since it is present in our local thread of accessed sip application sessions ");
-
                                                        }
                                                }
                                        }

==============================================================================
Revision: 08cba7998a83
Author:   Jean Deruelle <[email protected]>
Date:     Wed Apr 23 16:53:22 2014 UTC
Log:      Fixes Issue 265

(cherry picked from commit e46483ddff9cf0ac8e727d2ce69ffb1220840425)

Conflicts:
containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java

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

Modified:
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java

=======================================
--- /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Apr 23 13:26:04 2014 UTC +++ /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Apr 23 16:53:22 2014 UTC
@@ -1043,7 +1043,7 @@
                                break;
                        case SipApplicationSession:
                                if(logger.isDebugEnabled()) {
- logger.debug("checkIsManagedThread " + checkIsManagedThread + " , isManagedThread " + isManagedThread.get()); + logger.debug("checkIsManagedThread " + checkIsManagedThread + " , isManagedThread " + isManagedThread.get() + ", isContainerManaged " + isContainerManaged);
                                }
// http://code.google.com/p/mobicents/issues/detail?id=2534 && http://code.google.com/p/mobicents/issues/detail?id=2526 if(!checkIsManagedThread || (checkIsManagedThread && Boolean.TRUE.equals(isManagedThread.get()))) {
=======================================
--- /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Apr 23 13:26:04 2014 UTC +++ /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Apr 23 16:53:22 2014 UTC
@@ -1233,7 +1233,7 @@
                                break;
                        case SipApplicationSession:
                                if(logger.isDebugEnabled()) {
- logger.debug("checkIsManagedThread " + checkIsManagedThread + " , isManagedThread " + isManagedThread.get()); + logger.debug("checkIsManagedThread " + checkIsManagedThread + " , isManagedThread " + isManagedThread.get() + ", isContainerManaged " + isContainerManaged);
                                }
// http://code.google.com/p/mobicents/issues/detail?id=2534 && http://code.google.com/p/mobicents/issues/detail?id=2526 if(!checkIsManagedThread || (checkIsManagedThread && Boolean.TRUE.equals(isManagedThread.get()))) {

--

--- You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to