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/08 14:25:14 UTC

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

damitha     2004/04/08 05:25:14

  Modified:    c/src/engine DeserializerPool.cpp
  Log:
  replaced indent tabs with spaces; added apache 2 licence.
  
  Revision  Changes    Path
  1.10      +51 -98    ws-axis/c/src/engine/DeserializerPool.cpp
  
  Index: DeserializerPool.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/DeserializerPool.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DeserializerPool.cpp	24 Mar 2004 06:57:32 -0000	1.9
  +++ DeserializerPool.cpp	8 Apr 2004 12:25:13 -0000	1.10
  @@ -1,122 +1,75 @@
  +/* -*- 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)
    *
    */
   
  -// DeserializerPool.cpp: implementation of the DeserializerPool class.
  -//
  -//////////////////////////////////////////////////////////////////////
  -
   #include "DeserializerPool.h"
   #include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
  -
  -DeserializerPool::DeserializerPool()
  +DeserializerPool::DeserializerPool ()
   {
   
   }
   
  -DeserializerPool::~DeserializerPool()
  +DeserializerPool::~DeserializerPool ()
   {
  -	for (list<SoapDeSerializer*>::iterator it = m_DZList.begin(); it != m_DZList.end(); it++)
  -	{
  -		delete (*it);
  -	}
  +    for (list < SoapDeSerializer* >::iterator it = m_DZList.begin ();
  +        it != m_DZList.end (); it++)
  +    {
  +        delete (*it);
  +    }
   }
   
  -int DeserializerPool::GetInstance(SoapDeSerializer** ppDZ)
  +int DeserializerPool::GetInstance (SoapDeSerializer** ppDZ)
   {
  -	lock();
  -	if (!m_DZList.empty())
  -	{
  -		*ppDZ = m_DZList.front();
  -		m_DZList.pop_front();
  -	}
  -	else
  -	{
  -		*ppDZ = new SoapDeSerializer();
  -		if (AXIS_SUCCESS != (*ppDZ)->Init())
  -		{
  -			delete *ppDZ;
  -			*ppDZ = NULL;
  -			unlock();
  -            AXISTRACE1("Deserializer could not be initialized", CRITICAL);
  -			return AXIS_FAIL;
  -		}
  -	}
  -	unlock();
  -	return AXIS_SUCCESS;
  +    lock ();
  +    if (!m_DZList.empty ())
  +    {
  +        *ppDZ = m_DZList.front ();
  +        m_DZList.pop_front ();
  +    }
  +    else
  +    {
  +        *ppDZ = new SoapDeSerializer ();
  +        if (AXIS_SUCCESS != (*ppDZ)->Init ())
  +        {
  +            delete* ppDZ;
  +            *ppDZ = NULL;
  +            unlock ();
  +            AXISTRACE1 ("Deserializer could not be initialized", CRITICAL);
  +            return AXIS_FAIL;
  +        }
  +    }
  +    unlock ();
  +    return AXIS_SUCCESS;
   }
   
  -int DeserializerPool::PutInstance(SoapDeSerializer* pDZ)
  +int DeserializerPool::PutInstance (SoapDeSerializer* pDZ)
   {
  -	if (AXIS_SUCCESS != pDZ->Init())
  -	{
  -		delete pDZ;
  -		return AXIS_FAIL;
  -	}
  -	lock();
  -	m_DZList.push_back(pDZ);
  -	unlock();
  -	return AXIS_SUCCESS;
  +    if (AXIS_SUCCESS != pDZ->Init ())
  +    {
  +        delete pDZ;
  +        return AXIS_FAIL;
  +    }
  +    lock ();
  +    m_DZList.push_back (pDZ);
  +    unlock ();
  +    return AXIS_SUCCESS;
   }