(file) Return to OperationResponseHandler.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2

Diff for /pegasus/src/Pegasus/ProviderManager2/OperationResponseHandler.cpp between version 1.25 and 1.31

version 1.25, 2008/05/12 09:14:54 version 1.31, 2008/12/02 09:01:48
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  //
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  // Permission is hereby granted, free of charge, to any person obtaining a
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  // copy of this software and associated documentation files (the "Software"),
 // EMC Corporation; Symantec Corporation; The Open Group.  // to deal in the Software without restriction, including without limitation
 //  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // and/or sell copies of the Software, and to permit persons to whom the
 // of this software and associated documentation files (the "Software"), to  // Software is furnished to do so, subject to the following conditions:
 // deal in the Software without restriction, including without limitation the  //
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // The above copyright notice and this permission notice shall be included
 // sell copies of the Software, and to permit persons to whom the Software is  // in all copies or substantial portions of the Software.
 // furnished to do so, subject to the following conditions:  //
 //  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  //////////////////////////////////////////////////////////////////////////
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 37 
Line 35 
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/SharedPtr.h> #include <Pegasus/Common/SharedPtr.h>
 #include <Pegasus/Provider/CIMOMHandle.h> #include <Pegasus/Provider/CIMOMHandle.h>
   #include <Pegasus/Config/ConfigManager.h>
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
   static void _initializeNormalizer(
       CIMOperationRequestMessage *request,
       Boolean includeQualifiers,
       Boolean includeClassOrigin,
       ObjectNormalizer &normalizer)
   {
       // Attempt to get the cached class definition, normalization is disabled
       // if it does not exist.
       if (request->operationContext.contains(
               CachedClassDefinitionContainer::NAME))
       {
           CachedClassDefinitionContainer container =
               request->operationContext.get(
                   CachedClassDefinitionContainer::NAME);
           CIMClass cimClass = container.getClass().clone();
           container = CachedClassDefinitionContainer(cimClass);
           SharedPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());
           ObjectNormalizer tmpNormalizer(
               cimClass,
               includeQualifiers,
               includeClassOrigin,
               request->nameSpace,
               tmpContext);
           normalizer = tmpNormalizer;
       }
   }
   
 // //
 // OperationResponseHandler // OperationResponseHandler
 // //
Line 285 
Line 311 
     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback)     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback)
     : OperationResponseHandler(request, response, responseChunkCallback)     : OperationResponseHandler(request, response, responseChunkCallback)
 { {
 #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION      _initializeNormalizer(
     // Attempt to get the cached class definition used to validate results of          request,
     // this operation. If it does not exist, then this feature is disabled  
     // for this operation.  
     CIMClass cimClass;  
   
     if (request->operationContext.contains(  
             CachedClassDefinitionContainer::NAME))  
     {  
         CachedClassDefinitionContainer container =  
             request->operationContext.get(  
                 CachedClassDefinitionContainer::NAME);  
   
         cimClass = container.getClass();  
     }  
   
     SharedPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());  
     ObjectNormalizer tmpNormalizer(  
         cimClass,  
         request->includeQualifiers,         request->includeQualifiers,
         request->includeClassOrigin,         request->includeClassOrigin,
         request->nameSpace,          _normalizer);
         tmpContext);  
     _normalizer = tmpNormalizer;  
 #endif  
 } }
  
 void GetInstanceResponseHandler::deliver(const CIMInstance& cimInstance) void GetInstanceResponseHandler::deliver(const CIMInstance& cimInstance)
Line 332 
Line 338 
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
  
       CIMInstance localInstance(cimInstance);
 #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION
     // The normalizer expects an object path embedded in instances even     // The normalizer expects an object path embedded in instances even
     // though it is not required by this operation. Use the requested     // though it is not required by this operation. Use the requested
     // object path is missing from the instance.     // object path is missing from the instance.
     CIMInstance localInstance(cimInstance);  
   
     if (localInstance.getPath().getKeyBindings().size() == 0)     if (localInstance.getPath().getKeyBindings().size() == 0)
     {     {
         // ATTN: should clone before modification         // ATTN: should clone before modification
         localInstance.setPath(static_cast<CIMGetInstanceRequestMessage*>(         localInstance.setPath(static_cast<CIMGetInstanceRequestMessage*>(
             getRequest())->instanceName);             getRequest())->instanceName);
     }     }
   #endif
     SimpleInstanceResponseHandler::deliver(     SimpleInstanceResponseHandler::deliver(
         _normalizer.processInstance(localInstance));         _normalizer.processInstance(localInstance));
 #else  
     SimpleInstanceResponseHandler::deliver(cimInstance);  
 #endif  
 } }
  
 void GetInstanceResponseHandler::complete() void GetInstanceResponseHandler::complete()
Line 379 
Line 381 
         CIMGetInstanceResponseMessage& msg =         CIMGetInstanceResponseMessage& msg =
             *static_cast<CIMGetInstanceResponseMessage*>(getResponse());             *static_cast<CIMGetInstanceResponseMessage*>(getResponse());
  
         msg.cimInstance = getObjects()[0];          msg.setCimInstance(getObjects()[0]);
     }     }
 } }
  
Line 403 
Line 405 
     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback)     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback)
     : OperationResponseHandler(request, response, responseChunkCallback)     : OperationResponseHandler(request, response, responseChunkCallback)
 { {
 #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION      _initializeNormalizer(
     // Attempt to get the cached class definition used to validate results of          request,
     // this operation. If it does not exist, then this feature is disabled  
     // for this operation.  
     CIMClass cimClass;  
   
     if (request->operationContext.contains(  
             CachedClassDefinitionContainer::NAME))  
     {  
         CachedClassDefinitionContainer container =  
             request->operationContext.get(  
                 CachedClassDefinitionContainer::NAME);  
         cimClass = container.getClass();  
     }  
   
     SharedPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());  
     ObjectNormalizer tmpNormalizer(  
         cimClass,  
         request->includeQualifiers,         request->includeQualifiers,
         request->includeClassOrigin,         request->includeClassOrigin,
         request->nameSpace,          _normalizer);
         tmpContext);  
     _normalizer = tmpNormalizer;  
 #endif  
 } }
  
 void EnumerateInstancesResponseHandler::deliver(const CIMInstance& cimInstance) void EnumerateInstancesResponseHandler::deliver(const CIMInstance& cimInstance)
Line 440 
Line 423 
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
  
 #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION  
     SimpleInstanceResponseHandler::deliver(     SimpleInstanceResponseHandler::deliver(
         _normalizer.processInstance(cimInstance));         _normalizer.processInstance(cimInstance));
 #else  
     SimpleInstanceResponseHandler::deliver(cimInstance);  
 #endif  
 } }
  
 String EnumerateInstancesResponseHandler::getClass() const String EnumerateInstancesResponseHandler::getClass() const
Line 458 
Line 437 
     CIMEnumerateInstancesResponseMessage& msg =     CIMEnumerateInstancesResponseMessage& msg =
         *static_cast<CIMEnumerateInstancesResponseMessage*>(getResponse());         *static_cast<CIMEnumerateInstancesResponseMessage*>(getResponse());
  
     msg.cimNamedInstances = getObjects();      msg.setNamedInstances(getObjects());
 } }
  
 // //
Line 471 
Line 450 
     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback)     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback)
     : OperationResponseHandler(request, response, responseChunkCallback)     : OperationResponseHandler(request, response, responseChunkCallback)
 { {
 #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION      _initializeNormalizer(
     // Attempt to get the cached class definition used to validate results of          request,
     // this operation. If it does not exist, then this feature is disabled  
     // for this operation.  
     CIMClass cimClass;  
   
     if (request->operationContext.contains(  
             CachedClassDefinitionContainer::NAME))  
     {  
         CachedClassDefinitionContainer container =  
             request->operationContext.get(  
                 CachedClassDefinitionContainer::NAME);  
   
         cimClass = container.getClass();  
     }  
   
     SharedPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());  
     ObjectNormalizer tmpNormalizer(  
         cimClass,  
         false,         false,
         false,         false,
         request->nameSpace,          _normalizer);
         tmpContext);  
     _normalizer = tmpNormalizer;  
 #endif  
 } }
  
 void EnumerateInstanceNamesResponseHandler::deliver( void EnumerateInstanceNamesResponseHandler::deliver(
Line 510 
Line 469 
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
  
 #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION  
     SimpleObjectPathResponseHandler::deliver(     SimpleObjectPathResponseHandler::deliver(
         _normalizer.processInstanceObjectPath(cimObjectPath));         _normalizer.processInstanceObjectPath(cimObjectPath));
 #else  
     SimpleObjectPathResponseHandler::deliver(cimObjectPath);  
 #endif  
 } }
  
 String EnumerateInstanceNamesResponseHandler::getClass() const String EnumerateInstanceNamesResponseHandler::getClass() const


Legend:
Removed from v.1.25  
changed lines
  Added in v.1.31

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2