From 63d8374488ca66d8349be60abe4659032a15125b Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Tue, 21 Oct 2003 13:21:33 +0000
Subject: [PATCH] Reported by M.Negovanovic

2003-10-21  Mark Wielaard  <mark@klomp.org>

	Reported by M.Negovanovic
	* java/beans/Introspector.java (getBeanInfo(ClassLoader, String)): New
	method.
	(reallyFindExplicitBeanInfo): Use new getBeanInfo() method.

From-SVN: r72749
---
 libjava/ChangeLog                    |  7 +++
 libjava/java/beans/Introspector.java | 82 ++++++++++++++++------------
 2 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4946230c093..67dc182232e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-21  Mark Wielaard  <mark@klomp.org>
+
+	Reported by M.Negovanovic
+	* java/beans/Introspector.java (getBeanInfo(ClassLoader, String)): New
+	method.
+	(reallyFindExplicitBeanInfo): Use new getBeanInfo() method.
+
 2003-10-21  Sascha Brawer  <brawer@dandelis.ch>
 
 	Fix for Classpath bug #6076.
diff --git a/libjava/java/beans/Introspector.java b/libjava/java/beans/Introspector.java
index ac9e36721e4..b930b7469f5 100644
--- a/libjava/java/beans/Introspector.java
+++ b/libjava/java/beans/Introspector.java
@@ -1,5 +1,5 @@
 /* java.beans.Introspector
-   Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -518,40 +518,54 @@ class ExplicitInfo
   
   static BeanInfo reallyFindExplicitBeanInfo(Class beanClass) 
   {
-    try 
-      {
-      try 
-	{
-	  return (BeanInfo)Class.forName(beanClass.getName()+"BeanInfo").newInstance();
-	} 
-      catch(ClassNotFoundException E) 
-	{
-	}
-      String newName = ClassHelper.getTruncatedClassName(beanClass) + "BeanInfo";
-      for(int i=0;i<Introspector.beanInfoSearchPath.length;i++) 
-	{
-	  try 
-	    {
-	      if(Introspector.beanInfoSearchPath[i].equals("")) 
-		{
-		  return (BeanInfo)Class.forName(newName).newInstance();
-		} 
-	      else 
-		{
-		  return (BeanInfo)Class.forName(Introspector.beanInfoSearchPath[i] + "." + newName).newInstance();
-		}
-	    } 
-	  catch(ClassNotFoundException E) 
-	    {
-	    }
-	}
-      } 
-    catch(IllegalAccessException E) 
-      {
-      } 
-    catch(InstantiationException E) 
+    ClassLoader beanClassLoader = beanClass.getClassLoader();
+    BeanInfo beanInfo;
+
+    beanInfo = getBeanInfo(beanClassLoader, beanClass.getName() + "BeanInfo");
+    if (beanInfo == null)
       {
+	String newName;
+	newName = ClassHelper.getTruncatedClassName(beanClass) + "BeanInfo";
+
+	for(int i = 0; i < Introspector.beanInfoSearchPath.length; i++) 
+	  {
+	    if (Introspector.beanInfoSearchPath[i].equals("")) 
+	      beanInfo = getBeanInfo(beanClassLoader, newName);
+	    else 
+	      beanInfo = getBeanInfo(beanClassLoader,
+				     Introspector.beanInfoSearchPath[i] + "."
+				     + newName);
+
+	    if (beanInfo != null)
+	      return beanInfo;
+	  } 
       }
-    return null;
+
+    return beanInfo;
   }
+
+  /**
+   * Returns an instance of the given class name when it can be loaded
+   * through the given class loader, or null otherwise.
+   */
+  private static BeanInfo getBeanInfo(ClassLoader cl, String infoName)
+  {
+    try
+      {
+	return (BeanInfo) Class.forName(infoName, true, cl).newInstance();
+      }
+    catch (ClassNotFoundException cnfe)
+      {
+	return null;
+      }
+    catch (IllegalAccessException iae)
+      {
+	return null;
+      }
+    catch (InstantiationException ie)
+      {
+	return null;
+      }
+  }
+  
 }