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

version 1.4, 2005/02/05 23:00:32 version 1.9, 2006/06/09 15:02:28
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 30 
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)
 //     Adrian Schuur, IBM (schuur@de.ibm.com) //     Adrian Schuur, IBM (schuur@de.ibm.com)
   //     Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) for PEP#101
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include "JMPIProviderModule.h" #include "JMPIProviderModule.h"
  
 #include <Pegasus/Common/Destroyer.h>  
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/MessageLoader.h> //l10n #include <Pegasus/Common/MessageLoader.h> //l10n
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
Line 56 
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 74 
Line 83 
  
 ProviderVector JMPIProviderModule::load(const String & providerName) ProviderVector JMPIProviderModule::load(const String & providerName)
 { {
    ProviderVector pv;     ProviderVector  pv  = { 0, 0 };
    JvmVector *jv;     JvmVector      *jv  = NULL;
   
    JNIEnv *env=JMPIjvm::attachThread(&jv);    JNIEnv *env=JMPIjvm::attachThread(&jv);
    pv.jProvider=JMPIjvm::getProvider(env,_fileName,_className,  
         providerName.getCString(),&pv.jProviderClass);     if (env)
      {
         pv.jProvider = JMPIjvm::getProvider (env,
                                              _fileName,
                                              _className,
                                              providerName.getCString (),
                                              &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 98 
Line 121 
  
 void JMPIProviderModule::unloadModule(void) void JMPIProviderModule::unloadModule(void)
 { {
     if (_ref_count.DecAndTestIfZero())     if (_ref_count.decAndTestIfZero ())
     {     {
         if(_library != 0)         if(_library != 0)
         {         {
             System::unloadDynamicLibrary(_library);             System::unloadDynamicLibrary(_library);
   
             _library = 0;             _library = 0;
         }         }
     }     }

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