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

Diff for /pegasus/src/Pegasus/ProviderManager2/Attic/ProviderManagerService.cpp between version 1.81 and 1.87

version 1.81, 2006/06/19 20:47:39 version 1.87, 2006/07/26 20:34:03
Line 134 
Line 134 
     if (!forceProviderProcesses)     if (!forceProviderProcesses)
     {     {
         _basicProviderManagerRouter = new BasicProviderManagerRouter(         _basicProviderManagerRouter = new BasicProviderManagerRouter(
             indicationCallback, responseChunkCallback);              indicationCallback, responseChunkCallback,
               createDefaultProviderManagerCallback);
     }     }
 #endif #endif
 } }
Line 178 
Line 179 
     else     else
     {     {
         asyncRequest = new AsyncLegacyOperationStart(         asyncRequest = new AsyncLegacyOperationStart(
             get_next_xid(),  
             0,             0,
             this->getQueueId(),             this->getQueueId(),
             message,             message,
Line 199 
Line 199 
     {     {
         request->op->processing();         request->op->processing();
  
         _incomingQueue.enqueue(request->op);          _incomingQueue.insert_back(request->op);
         ThreadStatus rtn = PEGASUS_THREAD_OK;         ThreadStatus rtn = PEGASUS_THREAD_OK;
         while (( rtn =_thread_pool->allocate_and_awaken(         while (( rtn =_thread_pool->allocate_and_awaken(
                      (void *)this, ProviderManagerService::handleCimOperation)) != PEGASUS_THREAD_OK)                      (void *)this, ProviderManagerService::handleCimOperation)) != PEGASUS_THREAD_OK)
Line 256 
Line 256 
             return(PEGASUS_THREAD_RETURN(1));             return(PEGASUS_THREAD_RETURN(1));
         }         }
  
         AsyncOpNode* op = service->_incomingQueue.dequeue();          AsyncOpNode* op = service->_incomingQueue.remove_front();
           PEGASUS_ASSERT(op != 0);
         if ((op == 0) || (op->_request.count() == 0))          PEGASUS_ASSERT(op->_request.get() != 0);
         {  
             // ATTN: This may dereference a null pointer!  
             MessageQueue* queue = MessageQueue::lookup(op->_source_queue);  
   
             PEGASUS_ASSERT(queue != 0);  
   
             PEG_METHOD_EXIT();  
   
             // no request in op node  
             return(PEGASUS_THREAD_RETURN(1));  
         }  
  
         AsyncRequest* request =         AsyncRequest* request =
             static_cast<AsyncRequest*>(op->_request.next(0));              static_cast<AsyncRequest*>(op->_request.get());
  
         if ((request == 0) ||         if ((request == 0) ||
             (request->getType() != async_messages::ASYNC_LEGACY_OP_START))             (request->getType() != async_messages::ASYNC_LEGACY_OP_START))
Line 336 
Line 325 
     PEGASUS_ASSERT(request != 0);     PEGASUS_ASSERT(request != 0);
  
     // get request from op node     // get request from op node
     AsyncRequest * async = static_cast<AsyncRequest *>(op->_request.next(0));      AsyncRequest * async = static_cast<AsyncRequest *>(op->_request.get());
     PEGASUS_ASSERT(async != 0);     PEGASUS_ASSERT(async != 0);
  
     Message * response = 0;     Message * response = 0;
Line 585 
Line 574 
  
     AsyncLegacyOperationResult * async_result =     AsyncLegacyOperationResult * async_result =
         new AsyncLegacyOperationResult(         new AsyncLegacyOperationResult(
         async->getKey(),  
         async->getRouting(),  
         op,         op,
         response);         response);
  
Line 615 
Line 602 
         PEGASUS_ASSERT(op);         PEGASUS_ASSERT(op);
         PEGASUS_ASSERT(!response->_async);         PEGASUS_ASSERT(!response->_async);
         response->_async = new AsyncLegacyOperationResult(         response->_async = new AsyncLegacyOperationResult(
             requestAsync->getKey(), requestAsync->getRouting(), op, response);              op, response);
  
         // set the destination         // set the destination
         op->_op_dest = op->_callback_response_q;         op->_op_dest = op->_callback_response_q;
Line 864 
Line 851 
 void ProviderManagerService::indicationCallback( void ProviderManagerService::indicationCallback(
     CIMProcessIndicationRequestMessage* request)     CIMProcessIndicationRequestMessage* request)
 { {
     try      if(request->operationContext.contains(AcceptLanguageListContainer::NAME))
     {     {
         AcceptLanguageListContainer cntr = request->operationContext.get(AcceptLanguageListContainer::NAME);         AcceptLanguageListContainer cntr = request->operationContext.get(AcceptLanguageListContainer::NAME);
     }catch(const Exception &)      }
       else
     {     {
         request->operationContext.insert(AcceptLanguageListContainer(AcceptLanguageList()));         request->operationContext.insert(AcceptLanguageListContainer(AcceptLanguageList()));
     }     }
Line 888 
Line 876 
  
     AsyncLegacyOperationStart * asyncRequest =     AsyncLegacyOperationStart * asyncRequest =
         new AsyncLegacyOperationStart(         new AsyncLegacyOperationStart(
         providerManagerService->get_next_xid(),  
         0,         0,
         _indicationServiceQueueId,         _indicationServiceQueueId,
         request,         request,
Line 1019 
Line 1006 
     request->queueIds = QueueIdStack     request->queueIds = QueueIdStack
         (_indicationServiceQueueId, providerManagerService->getQueueId ());         (_indicationServiceQueueId, providerManagerService->getQueueId ());
  
     AsyncLegacyOperationStart * asyncRequest = new AsyncLegacyOperationStart      AsyncLegacyOperationStart * asyncRequest = new AsyncLegacyOperationStart(
         (providerManagerService->get_next_xid (),  
         0,         0,
         _indicationServiceQueueId,         _indicationServiceQueueId,
         request,         request,

Legend:
Removed from v.1.81  
changed lines
  Added in v.1.87
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2