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

Diff for /pegasus/src/Pegasus/ProviderManager2/JMPI/JMPIProviderModule.cpp between version 1.8 and 1.11

version 1.8, 2006/01/30 16:18:10 version 1.11, 2008/01/08 20:15:15
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Chip Vincent (cvincent@us.ibm.com)  
 //  
 // Modified By:  
 //      Nag Boranna, Hewlett-Packard Company(nagaraja_boranna@hp.com)  
 //              Yi Zhou, Hewlett-Packard Company(yi_zhou@hp.com)  
 //     Mike Day, IBM (mdday@us.ibm.com)  
 //     Adrian Schuur, IBM (schuur@de.ibm.com)  
 //     Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) for PEP#101  
 //  
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
   // NOCHKSRC
   
 #include "JMPIProviderModule.h" #include "JMPIProviderModule.h"
  
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/MessageLoader.h> //l10n  #include <Pegasus/Common/MessageLoader.h>
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
 #include <Pegasus/ProviderManager2/JMPI/JMPIProvider.h> #include <Pegasus/ProviderManager2/JMPI/JMPIProvider.h>
 #include <Pegasus/ProviderManager2/JMPI/JMPIProviderManager.h> #include <Pegasus/ProviderManager2/JMPI/JMPIProviderManager.h>
Line 53 
Line 46 
 JMPIProviderModule::JMPIProviderModule(const String & fileName, JMPIProviderModule::JMPIProviderModule(const String & fileName,
                                        const String & interfaceName)                                        const String & interfaceName)
     : _fileName(fileName),     : _fileName(fileName),
     _interfaceName(interfaceName),        _interfaceName (interfaceName)
     _ref_count(0),  
     _library(0)  
 { {
    Uint32 i=fileName.find(".jar:");    Uint32 i=fileName.find(".jar:");
    if (i==PEG_NOT_FOUND) {  
      if (i == PEG_NOT_FOUND)
      {
       String msg="Invalid Location format for Java providers: "+fileName;       String msg="Invalid Location format for Java providers: "+fileName;
   
       throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,msg);       throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,msg);
    }    }
   
    String jar=fileName.subString(0,i+4);    String jar=fileName.subString(0,i+4);
   
    _className=fileName.subString(i+5);    _className=fileName.subString(i+5);
  
    if (jar[0]!='/')    if (jar[0]!='/')
       _fileName=JMPIProviderManager::resolveFileName(jar);       _fileName=JMPIProviderManager::resolveFileName(jar);
    else _fileName=jar;     else
         _fileName = jar;
 } }
  
 JMPIProviderModule::~JMPIProviderModule(void) JMPIProviderModule::~JMPIProviderModule(void)
Line 76 
Line 73 
  
 ProviderVector JMPIProviderModule::load(const String & providerName) ProviderVector JMPIProviderModule::load(const String & providerName)
 { {
     ProviderVector  pv;     ProviderVector  pv  = { 0, 0 };
     JvmVector      *jv  = NULL;     JvmVector      *jv  = NULL;
     JNIEnv         *env = JMPIjvm::attachThread(&jv);     JNIEnv         *env = JMPIjvm::attachThread(&jv);
  
Line 89 
Line 86 
                                             &pv.jProviderClass);                                             &pv.jProviderClass);
        JMPIjvm::detachThread ();        JMPIjvm::detachThread ();
     }     }
      else
      {
         throw PEGASUS_CIM_EXCEPTION_L (CIM_ERR_FAILED,
                                        MessageLoaderParms ("ProviderManager.JMPI.INIT_JVM_FAILED",
                                                            "Could not initialize the JVM (Java Virtual Machine) runtime environment."));
      }
  
     if (pv.jProvider == 0)     if (pv.jProvider == 0)
     {     {
         String s0 = "ProviderLoadFailure";         String s0 = "ProviderLoadFailure";
         throw Exception(MessageLoaderParms("ProviderManager.JMPIProviderModule.CANNOT_LOAD_LIBRARY",  
             "$0 ($1:$2):Cannot load library",        throw Exception(MessageLoaderParms(
             "ProviderManager.JMPI.JMPIProviderModule.CANNOT_LOAD_LIBRARY",
             "$0 ($1:$2): Cannot load library.",
             s0,             s0,
             _fileName,             _fileName,
             providerName));             providerName));
     }     }
  
     _ref_count++;  
   
     return pv;     return pv;
 } }
  
 void JMPIProviderModule::unloadModule(void) void JMPIProviderModule::unloadModule(void)
 { {
     if (_ref_count.decAndTestIfZero())  
     {  
         if(_library != 0)  
         {  
             System::unloadDynamicLibrary(_library);  
             _library = 0;  
         }  
     }  
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END


Legend:
Removed from v.1.8  
changed lines
  Added in v.1.11

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2