(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.8.2.1

version 1.8, 2006/01/30 16:18:10 version 1.8.2.1, 2006/06/23 17:44:59
Line 32 
Line 32 
 // Author: Chip Vincent (cvincent@us.ibm.com) // Author: Chip Vincent (cvincent@us.ibm.com)
 // //
 // Modified By: // Modified By:
   //     Mark Hamzy (hamzy@us.ibm.com)
 //      Nag Boranna, Hewlett-Packard Company(nagaraja_boranna@hp.com) //      Nag Boranna, Hewlett-Packard Company(nagaraja_boranna@hp.com)
 //              Yi Zhou, Hewlett-Packard Company(yi_zhou@hp.com) //              Yi Zhou, Hewlett-Packard Company(yi_zhou@hp.com)
 //     Mike Day, IBM (mdday@us.ibm.com) //     Mike Day, IBM (mdday@us.ibm.com)
Line 58 
Line 59 
     _library(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 83 
  
 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 96 
                                             &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",         throw Exception(MessageLoaderParms("ProviderManager.JMPIProviderModule.CANNOT_LOAD_LIBRARY",
             "$0 ($1:$2):Cannot load library",             "$0 ($1:$2):Cannot load library",
             s0,             s0,
Line 112 
Line 126 
         if(_library != 0)         if(_library != 0)
         {         {
             System::unloadDynamicLibrary(_library);             System::unloadDynamicLibrary(_library);
   
             _library = 0;             _library = 0;
         }         }
     }     }

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