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

Diff for /pegasus/src/Pegasus/ProviderManager2/Default/DefaultProviderManager.cpp between version 1.76 and 1.78

version 1.76, 2006/10/10 18:27:09 version 1.78, 2006/11/14 18:34:56
Line 40 
Line 40 
 #include <Pegasus/Common/StatisticalData.h> #include <Pegasus/Common/StatisticalData.h>
 #include <Pegasus/Common/Logger.h> #include <Pegasus/Common/Logger.h>
 #include <Pegasus/Common/MessageLoader.h> #include <Pegasus/Common/MessageLoader.h>
   #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/PegasusVersion.h> #include <Pegasus/Common/PegasusVersion.h>
 #include <Pegasus/Common/Constants.h> #include <Pegasus/Common/Constants.h>
  
Line 221 
Line 222 
         //         //
         Array<CIMInstance> providerInstances = request->providers;         Array<CIMInstance> providerInstances = request->providers;
  
         String physicalName = _resolvePhysicalName(  
             mInstance.getProperty(  
                 mInstance.findProperty("Location")).getValue().toString());  
   
         for (Uint32 i = 0, n = providerInstances.size(); i < n; i++)         for (Uint32 i = 0, n = providerInstances.size(); i < n; i++)
         {         {
             String pName;             String pName;
Line 387 
Line 384 
     genericValue = providerId.getModule().getProperty(     genericValue = providerId.getModule().getProperty(
         providerId.getModule().findProperty("Location")).getValue();         providerId.getModule().findProperty("Location")).getValue();
     genericValue.get(fileName);     genericValue.get(fileName);
     fileName = _resolvePhysicalName(fileName);  
  
     // ATTN: This attribute is probably not required     // ATTN: This attribute is probably not required
     genericValue = providerId.getModule().getProperty(     genericValue = providerId.getModule().getProperty(
         providerId.getModule().findProperty("InterfaceType")).getValue();         providerId.getModule().findProperty("InterfaceType")).getValue();
     genericValue.get(interfaceName);     genericValue.get(interfaceName);
  
     return ProviderName(providerName, fileName, interfaceName, 0);      String resolvedFileName = _resolvePhysicalName(fileName);
   
       if (resolvedFileName == String::EMPTY)
       {
           // Provider library not found
           String moduleName;
           genericValue = providerId.getModule().getProperty(
               providerId.getModule().findProperty("Name")).getValue();
           genericValue.get(moduleName);
   
           throw Exception(MessageLoaderParms(
               "ProviderManager.ProviderManagerService.PROVIDER_FILE_NOT_FOUND",
               "File \"$0\" was not found for provider module \"$1\".",
               FileSystem::buildLibraryFileName(fileName), moduleName));
       }
   
       return ProviderName(providerName, resolvedFileName, interfaceName, 0);
 } }
  
 ProviderOperationCounter DefaultProviderManager::_getProvider( ProviderOperationCounter DefaultProviderManager::_getProvider(


Legend:
Removed from v.1.76  
changed lines
  Added in v.1.78

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2