Connector/MXJ commit: r91 - in trunk/connector-mxj: . src/com/mysql/management/util

[eherman]

Modified:
   trunk/connector-mxj/CHANGES
   trunk/connector-mxj/src/com/mysql/management/util/Streams.java
Log:
added null-check to deal with C/MXJ being loaded by the bootstrap 
classloaders with JVMs for which getClassLoader() returns null 
found by Sloan Childers on WinXP


Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES	2007-05-14 13:18:53 UTC (rev 90)
+++ trunk/connector-mxj/CHANGES	2007-05-14 16:46:41 UTC (rev 91)
@@ -1,6 +1,10 @@
 # Changelog
 # $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
 
[phone] - added null-check to deal with C/MXJ being loaded by the bootstrap 
+             classloaders with JVMs for which getClassLoader() returns null 
+             found by Sloan Childers on WinXP
+
 5-0-6-beta
 
 2007-05-04 - removed "use-default-architecture" property replaced

Modified: trunk/connector-mxj/src/com/mysql/management/util/Streams.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/Streams.java	2007-05-14 13:18:53 UTC (rev 90)
+++ trunk/connector-mxj/src/com/mysql/management/util/Streams.java	2007-05-14 16:46:41 UTC (rev 91)
@@ -107,8 +107,7 @@
      * @throws MissingResourceException
      */
     public InputStream getResourceAsStream(String name) {
-        ClassLoader classLoader = getClass().getClassLoader();
-        return getResourceAsStream(classLoader, name);
+        return getResourceAsStream(getClass(), name);
     }
 
     /**
@@ -117,9 +116,22 @@
      * @return an InputStream
      * @throws MissingResourceException
      */
-    public InputStream getResourceAsStream(ClassLoader classLoader, String name) {
-        InputStream is = classLoader.getResourceAsStream(name);
+    public InputStream getResourceAsStream(Class aClass, String name) {
+        InputStream is = null;
+        ClassLoader classLoader = aClass.getClassLoader();
+        if (classLoader != null) {
+            is = classLoader.getResourceAsStream(name);
+        }
+        if (is == null && classLoader != null) {
+            is = classLoader.getResourceAsStream("/" + name);
+        }
         if (is == null) {
+            is = aClass.getResourceAsStream(name);
+        }
+        if (is == null) {
+            is = aClass.getResourceAsStream("/" + name);
+        }
+        if (is == null) {
             String msg = "Resource '" + name + "' not found";
             throw new MissingResourceException(msg, null, name);
         }