[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Classpathx-javamail] Session.java patch for loading resources from jar
From: |
Doug Porter |
Subject: |
[Classpathx-javamail] Session.java patch for loading resources from jar |
Date: |
Sun, 07 Sep 2003 11:14:00 -0800 |
diff -r /usr/src/CVS/classpathx/mail/source/javax/mail/Session.java
/usr/src/tiger-0.5.2-test/thirdparty/classpathx-javamail-customized/mail/source/javax/mail/Session.java
115,116c115,116
< loadProviders(loader.getResourceAsStream(DEFAULT_PROVIDERS),
"default");
< loadProviders(loader.getResourceAsStream(CUSTOM_PROVIDERS),
"custom");
---
> loadProviders(getResourceStream(loader, DEFAULT_PROVIDERS), "default");
> loadProviders(getResourceStream(loader, CUSTOM_PROVIDERS), "custom");
136,137c136,137
< loadAddressMap(loader.getResourceAsStream(DEFAULT_ADDRESS_MAP),
"default");
< loadAddressMap(loader.getResourceAsStream(CUSTOM_ADDRESS_MAP),
"custom");
---
> loadAddressMap(getResourceStream(loader, DEFAULT_ADDRESS_MAP), "default");
> loadAddressMap(getResourceStream(loader, CUSTOM_ADDRESS_MAP), "custom");
148a149,186
> }
>
> /** Get a resource input stream.
> */
> private InputStream getResourceStream(ClassLoader loader, String resource)
> {
> final String Slash = "/";
> InputStream in;
>
> try {
>
> // !!!!! loader seems to be unavailable with kaffe 2003-01-22
> if (loader == null) {
>
> in = getClass().getResourceAsStream (resource);
> if (in == null &&
> ! resource.startsWith(Slash)) {
> in = getClass().getResourceAsStream (Slash + resource);
> }
>
> }
> else {
>
> in = loader.getResourceAsStream (resource);
> if (in == null &&
> ! resource.startsWith(Slash)) {
> in = loader.getResourceAsStream (Slash + resource);
> }
>
> }
>
> }
> catch (Exception e) {
> // e.printStackTrace();
> in = null;
> }
>
> return in;
--
Doug Porter
address@hidden
--
http://www.fastmail.fm - Same, same, but differentÂ…
- [Classpathx-javamail] Session.java patch for loading resources from jar,
Doug Porter <=