(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.6 and 1.9

version 1.6, 2003/08/21 19:36:25 version 1.9, 2003/10/08 16:31:16
Line 77 
Line 77 
     Array<Pair<String, String> > temp;     Array<Pair<String, String> > temp;
  
     #if defined(ENABLE_DEFAULT_PROVIDER_MANAGER)     #if defined(ENABLE_DEFAULT_PROVIDER_MANAGER)
       #if defined(PEGASUS_OS_OS400)
       temp.append(Pair<String, String>(_resolveFileName("QSYS/QYCMDFTPVM"), String("DEFAULT")));
       #else
     temp.append(Pair<String, String>(_resolveFileName("DefaultProviderManager"), String("DEFAULT")));     temp.append(Pair<String, String>(_resolveFileName("DefaultProviderManager"), String("DEFAULT")));
     #endif     #endif
       #endif
  
     #if defined(ENABLE_CMPI_PROVIDER_MANAGER)     #if defined(ENABLE_CMPI_PROVIDER_MANAGER)
       #if defined(PEGASUS_OS_OS400)
       temp.append(Pair<String, String>(_resolveFileName("QSYS/QYCMCMPIPM"), String("CMPI")));
       #else
     temp.append(Pair<String, String>(_resolveFileName("CMPIProviderManager"), String("CMPI")));     temp.append(Pair<String, String>(_resolveFileName("CMPIProviderManager"), String("CMPI")));
     #endif     #endif
       #endif
  
     return(temp);     return(temp);
 } }
Line 183 
Line 191 
                 throw 0;    // ATTN: inefficient                 throw 0;    // ATTN: inefficient
             }             }
  
             // ATTN: only set the hacked/cached provider registration manager pointer after the  
             // DEFAULT provider manager is loaded.  
             if(String::equalNoCase(_fileNames[i].second, "DEFAULT"))  
             {  
                 manager->setProviderRegistrationManager(providerRegistrationManager);  
             }  
   
             _providerManagers.append(Pair<ProviderManager *, ProviderManagerModule>(manager, module));             _providerManagers.append(Pair<ProviderManager *, ProviderManagerModule>(manager, module));
         }         }
         catch(...)         catch(...)
Line 322 
Line 323 
 { {
     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER, "ProviderManagerService::handleCimOperation");     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER, "ProviderManagerService::handleCimOperation");
  
       if(arg == 0)
       {
           // thread started with invalid argument.
           return(PEGASUS_THREAD_RETURN(1));
       }
   
     // get the service from argument     // get the service from argument
     ProviderManagerService * service = reinterpret_cast<ProviderManagerService *>(arg);     ProviderManagerService * service = reinterpret_cast<ProviderManagerService *>(arg);
  
     PEGASUS_ASSERT(service != 0);  
   
     if(service->_incomingQueue.size() == 0)     if(service->_incomingQueue.size() == 0)
     {     {
         PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL4,         PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL4,
Line 340 
Line 345 
  
     AsyncOpNode * op = service->_incomingQueue.dequeue();     AsyncOpNode * op = service->_incomingQueue.dequeue();
  
     PEGASUS_ASSERT(op != 0 );      if((op == 0) || (op->_request.count() == 0))
   
     if(op->_request.count() == 0)  
     {     {
         MessageQueue * queue = MessageQueue::lookup(op->_source_queue);         MessageQueue * queue = MessageQueue::lookup(op->_source_queue);
  
Line 356 
Line 359 
  
     AsyncRequest * request = static_cast<AsyncRequest *>(op->_request.next(0));     AsyncRequest * request = static_cast<AsyncRequest *>(op->_request.next(0));
  
     PEGASUS_ASSERT(request != 0);      if((request == 0) || (request->getType() != async_messages::ASYNC_LEGACY_OP_START))
   
     if(request->getType() != async_messages::ASYNC_LEGACY_OP_START)  
     {     {
         // reply with NAK         // reply with NAK
  
Line 367 
Line 368 
         return(PEGASUS_THREAD_RETURN(0));         return(PEGASUS_THREAD_RETURN(0));
     }     }
  
       try
       {
     Message * legacy = static_cast<AsyncLegacyOperationStart *>(request)->get_action();     Message * legacy = static_cast<AsyncLegacyOperationStart *>(request)->get_action();
  
     if(_isSupportedRequestType(legacy))     if(_isSupportedRequestType(legacy))
Line 389 
Line 392 
             Thread::clearLanguages();             Thread::clearLanguages();
         }         }
  
         try  
         {  
             service->handleCimRequest(op, legacy);             service->handleCimRequest(op, legacy);
         }         }
       }
         catch(...)         catch(...)
         {         {
             // ATTN: log error             // ATTN: log error
         }         }
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
  
     return(PEGASUS_THREAD_RETURN(0));     return(PEGASUS_THREAD_RETURN(0));
 } }
  
 void ProviderManagerService::handleCimRequest(AsyncOpNode * op, const Message * message) throw()  void ProviderManagerService::handleCimRequest(AsyncOpNode * op, const Message * message)
 { {
     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER, "ProviderManagerService::handleCimRequest");     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER, "ProviderManagerService::handleCimRequest");
  
Line 458 
Line 459 
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END
   

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