You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2004/04/09 06:05:39 UTC

cvs commit: ws-axis/c/src/engine RequestScopeHandlerPool.cpp

damitha     2004/04/08 21:05:39

  Modified:    c/src/engine RequestScopeHandlerPool.cpp
  Log:
  replaced indent tabs with spaces; added apache 2 licence.
  
  Revision  Changes    Path
  1.9       +71 -111   ws-axis/c/src/engine/RequestScopeHandlerPool.cpp
  
  Index: RequestScopeHandlerPool.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/RequestScopeHandlerPool.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RequestScopeHandlerPool.cpp	23 Mar 2004 05:30:08 -0000	1.8
  +++ RequestScopeHandlerPool.cpp	9 Apr 2004 04:05:39 -0000	1.9
  @@ -1,137 +1,97 @@
  +/* -*- C++ -*- */
   /*
  - * The Apache Software License, Version 1.1
  - *
  - *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "SOAP" and "Apache Software Foundation" must
  - *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - *
  + *   Copyright 2003-2004 The Apache Software Foundation.
    *
  + *   Licensed under the Apache License, Version 2.0 (the "License");
  + *   you may not use this file except in compliance with the License.
  + *   You may obtain a copy of the License at
  + *
  + *       http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *   Unless required by applicable law or agreed to in writing, software
  + *   distributed under the License is distributed on an "AS IS" BASIS,
  + *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *   See the License for the specific language governing permissions and
  + *   limitations under the License.
    *
    *
    * @author Susantha Kumara (skumara@virtusa.com)
    *
    */
   
  -// RequestScopeHandlerPool.cpp: implementation of the RequestScopeHandlerPool class.
  -//
  -//////////////////////////////////////////////////////////////////////
   
   #include "RequestScopeHandlerPool.h"
   #include "HandlerLoader.h"
   
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
   extern HandlerLoader* g_pHandlerLoader;
   
  -RequestScopeHandlerPool::RequestScopeHandlerPool()
  +RequestScopeHandlerPool::RequestScopeHandlerPool ()
   {
   
   }
   
  -RequestScopeHandlerPool::~RequestScopeHandlerPool()
  +RequestScopeHandlerPool::~RequestScopeHandlerPool ()
   {
  -	for (map<int, list<BasicHandler*> >::iterator it = m_Handlers.begin(); it != m_Handlers.end(); it++)
  -	{
  -		for (list<BasicHandler*>::iterator itr = (*it).second.begin(); itr != (*it).second.end(); itr++)
  -		{
  -			g_pHandlerLoader->DeleteHandler(*itr, (*it).first);
  -		}
  -		(*it).second.clear();
  -	}
  -	m_Handlers.clear();
  +    for (map < int, list <BasicHandler*> >::iterator it =
  +        m_Handlers.begin (); it != m_Handlers.end (); it++)
  +    {
  +        for (list <BasicHandler*>::iterator itr = (*it).second.begin ();
  +            itr != (*it).second.end (); itr++)
  +        {
  +            g_pHandlerLoader->DeleteHandler (*itr, (*it).first);
  +        }
  +        (*it).second.clear ();
  +    }
  +    m_Handlers.clear ();
   }
   
  -int RequestScopeHandlerPool::GetInstance(BasicHandler** pHandler, int nLibId)
  -{    
  -	lock();
  -	int Status;
  -	if (m_Handlers.find(nLibId) != m_Handlers.end()) 
  -	{
  -		if (m_Handlers[nLibId].empty())
  -		{
  -			Status = g_pHandlerLoader->CreateHandler(pHandler, nLibId);
  -			if (AXIS_SUCCESS == Status)
  -			{
  -				//this just creates the entry in m_Handlers so that next time we know that the DLL is loaded
  -				m_Handlers[nLibId].clear();	
  -			}
  -			unlock();
  -			return Status;
  -		}
  -		else
  -		{
  -			*pHandler = m_Handlers[nLibId].front();
  -			m_Handlers[nLibId].pop_front();
  -			unlock();
  -			return AXIS_SUCCESS;
  -		}
  -	}
  -	else //not even the handler DLL loaded
  -	{
  -		Status = g_pHandlerLoader->CreateHandler(pHandler, nLibId);
  -		if (AXIS_SUCCESS == Status)
  -		{
  -			//this just creates the entry in m_Handlers so that next time we know that the DLL is loaded
  -			m_Handlers[nLibId].clear();	
  -		}
  -		unlock();
  -		return Status;
  -	}
  +int RequestScopeHandlerPool::GetInstance (BasicHandler** pHandler, int nLibId)
  +{
  +    lock ();
  +    int Status;
  +    if (m_Handlers.find (nLibId) != m_Handlers.end ())
  +    {
  +        if (m_Handlers[nLibId].empty ())
  +        {
  +            Status = g_pHandlerLoader->CreateHandler (pHandler, nLibId);
  +            if (AXIS_SUCCESS == Status)
  +            {
  +                /* This just creates the entry in m_Handlers so that next 
  +	         * time we know that the DLL is loaded
  +		 */ 
  +                m_Handlers[nLibId].clear ();
  +            }
  +            unlock ();
  +            return Status;
  +        }
  +        else
  +        {
  +            *pHandler = m_Handlers[nLibId].front ();
  +            m_Handlers[nLibId].pop_front ();
  +            unlock ();
  +            return AXIS_SUCCESS;
  +        }
  +    }
  +    else // Not even the handler DLL loaded
  +    {
  +        Status = g_pHandlerLoader->CreateHandler (pHandler, nLibId);
  +        if (AXIS_SUCCESS == Status)
  +        {
  +            /* This just creates the entry in m_Handlers so that next time we 
  +	     * know that the DLL is loaded
  +	     */ 
  +            m_Handlers[nLibId].clear ();
  +        }
  +        unlock ();
  +        return Status;
  +    }
   }
   
  -int RequestScopeHandlerPool::PutInstance(BasicHandler* pHandler, int nLibId)
  +int RequestScopeHandlerPool::PutInstance (BasicHandler* pHandler, int nLibId)
   {
  -	lock();
  -	m_Handlers[nLibId].push_back(pHandler);
  -	unlock();
  -	return AXIS_SUCCESS;
  +    lock ();
  +    m_Handlers[nLibId].push_back (pHandler);
  +    unlock ();
  +    return AXIS_SUCCESS;
   }
  
  
  

Re: cvs commit: ws-axis/c/src/engine RequestScopeHandlerPool.cpp

Posted by Adhamh Findlay <af...@austin.rr.com>.
Is it possible to get removed from this mailing list?  I unsubcribed from
the dev list, but I am still getting these emails.   I would really like to
make the stop.  I don't see a way to unsubscribe from this list at
http://ws.apache.org/axis/mail.html.

Thanks,

Adhamh


Re: cvs commit: ws-axis/c/src/engine RequestScopeHandlerPool.cpp

Posted by Adhamh Findlay <af...@austin.rr.com>.
Is it possible to get removed from this mailing list?  I unsubcribed from
the dev list, but I am still getting these emails.   I would really like to
make the stop.  I don't see a way to unsubscribe from this list at
http://ws.apache.org/axis/mail.html.

Thanks,

Adhamh