Re: [cp-patches] Native library class loader fixes

[Archie Cobbs]

Jeroen Frijters wrote:
> Thanks. I wouldn't make this change though:
> 
> -           throw new UnsatisfiedLinkError("Could not load library " +
> filename);
> -          }
> +         throw new UnsatisfiedLinkError("Could not find library " +
> libname);
> 
> The nicest would actually be to include both names in the exception
> message.

Yes.. how's this:

   void loadLibrary(String libname, ClassLoader loader)
   {
     SecurityManager sm = SecurityManager.current; // Be thread-safe!
     if (sm != null)
       sm.checkLink(libname);
     String filename;
     if (loader != null && (filename = loader.findLibrary(libname)) != null)
       {
         if (loadLib(filename, loader) != 0)
           return;
       }
     else
       {
         filename = VMRuntime.mapLibraryName(libname);
         for (int i = 0; i < libpath.length; i++)
           if (loadLib(libpath[i] + filename, loader) != 0)
             return;
       }
     throw new UnsatisfiedLinkError("Native library `" + libname
       + "' not found (as file `" + filename + "')");
   }

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com


*
Confidentiality Notice: This e-mail message, including any attachments, is for 
the sole use of the intended recipient(s) and may contain confidential and 
privileged information. Any unauthorized review, use, disclosure or 
distribution is prohibited. If you are not the intended
recipient, please contact the sender by reply e-mail and destroy all copies of 
the original message.
*