[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] engine/session clientsession.cpp, 1.72.2.41.2.29,
From:       dcollins () helixcommunity ! org
Date:       2009-02-26 18:06:01
Message-ID: 200902261944.n1QJiXqZ001603 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/engine/session
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv15786

Modified Files:
      Tag: SERVER_12_1
	clientsession.cpp 
Log Message:
Synopsis
========
Fix FCS-related build-buster when building the DNA and Plus servers.

Branches: SERVER_12_1, HEAD
Reviewer: Anyone (pending)


Description
===========

The m_bIsFCSURL member variable was moved inside the FCS #ifdef.
There were a couple of places in clientsession.cpp that referenced
it outside this ifdef.  The fix is to put ifdefs around the
code where it is used.

Files Affected
==============

server/engine/session/clientsession.cpp


Testing Performed
=================

Unit Tests:
- None.

Integration Tests:
- None.

Leak Tests:
- None.

Performance Tests:
- None

Platforms Tested: none (build-buster only)
Build verified: linux-rhel5-i686


QA Hints
========
- N/A



Index: clientsession.cpp
===================================================================
RCS file: /cvsroot/server/engine/session/clientsession.cpp,v
retrieving revision 1.72.2.41.2.29
retrieving revision 1.72.2.41.2.30
diff -u -d -r1.72.2.41.2.29 -r1.72.2.41.2.30
--- clientsession.cpp	25 Feb 2009 20:59:48 -0000	1.72.2.41.2.29
+++ clientsession.cpp	26 Feb 2009 18:05:58 -0000	1.72.2.41.2.30
@@ -392,11 +392,13 @@
     {
         IUnknown* pSession=0;
 
+#ifdef HELIX_FEATURE_SERVER_FCS
         if (m_bIsFCSURL)
         {
             m_pProc->pc->fcs_session_map->remove(m_sGuid, pSession);
         }
         else
+#endif
         {
             m_pProc->pc->sspl_session_map->remove(m_sGuid, pSession);
         }
@@ -5150,11 +5152,13 @@
     {
         IUnknown* pSession=0;
 
+#ifdef HELIX_FEATURE_SERVER_FCS
         if (m_bIsFCSURL)
         {
             m_pProc->pc->fcs_session_map->remove(m_sGuid, pSession);
         }
         else
+#endif
         {
             m_pProc->pc->sspl_session_map->remove(m_sGuid, pSession);
         }


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]