summaryrefslogtreecommitdiff
path: root/gnu/java/rmi/server/CombinedClassLoader.java
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-03-25 11:29:55 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-03-25 11:29:55 +0000
commitfd99eeecef751d7370247945a65e183af07f1d40 (patch)
tree43cffe865f2578427ee01a475ad1bfb9c0d50a78 /gnu/java/rmi/server/CombinedClassLoader.java
parent6e5998c74acb9f802a6429f9647e540d07ce53d5 (diff)
downloadclasspath-fd99eeecef751d7370247945a65e183af07f1d40.tar.gz
2006-03-07 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/java/rmi/server/UnicastRef.java, * gnu/java/rmi/server/UnicastServer.java: Formatted. 2006-03-07 Audrius Meskauskas <AudriusA@Bioinformatics.org> * gnu/java/rmi/server/CombinedClassLoader.java (findClass, findLibrary, findResouce, findResources): check all loaders in array. 2006-03-07 Audrius Meskauskas <AudriusA@Bioinformatics.org> PR 25526 * gnu/java/rmi/dgc/DGCImpl.java (LeaseRecord, leaseCache): Removed. (RefProtector): new inner class. (dirty): Rewritten. * gnu/java/rmi/server/UnicastRef.java (dgcId, dgcInterfaceHash, dgcSequence, DIRTY, this_id): New fields. (equals, hashCode, notifyDGC): new methods. (readExternal): Create LeaseRenewingTask if non local. * gnu/java/rmi/server/UnicastServer.java (objects): Use WeakHashMap. (refcache): Use WeakIdentityHashMap. (getExported): New method. * gnu/java/rmi/dgc/LeaseRenewingTask.java: New file. 2006-03-06 Mark Wielaard <mark@klomp.org> * doc/www.gnu.org/announce/20060306.wml: New file. * doc/www.gnu.org/newsitems.txt: Add 0.90 release announcement. * doc/www.gnu.org/downloads/downloads.wml: Add 0.90. 2006-03-06 David Gilbert <david.gilbert@object-refinery.com> * javax/swing/plaf/metal/MetalLookAndFeel.java (initComponentDefaults): Use Boolean.TRUE for 'CheckBoxMenuItem.borderPainted'. 2006-03-06 Wolfgang Baer <WBaer@gmx.de> * gnu/java/net/protocol/http/Headers.java: Added documentation all over. (dateFormat): Made private. (put): Replace only the last occurance and the value. (putAll): Reimplemented with the put method. 2006-03-06 Lillian Angel <langel@redhat.com> PR classpath/26569 * java/awt/List.java (preferredSize): Return the size of the list if the peer is null. * gnu/java/awt/peer/gtk/GtkListPeer.java (preferredSize): Code was returning the minimum size of the list. Added adjustment to the width of the list so it is a proper size. 2006-03-06 Wolfgang Baer <WBaer@gmx.de> * gnu/java/net/protocol/http/HTTPURLConnection.java: Organized imports. (getRequestProperty): Remove duplicated null check. * java/net/URLConnection.java: (URLConnection): Javadoc fix. (addRequestProperty): Likewise. (getDefaultRequestProperty): Likewise. (getHeaderField): Likewise. (getHeaderFieldDate): Likewise. (getHeaderFieldKey): Likewise. (getHeaderFields): Likewise. (getRequestProperties): Likewise. (getRequestProperty): Likewise. (setDefaultRequestProperty): Likewise. (setRequestProperty): Likewise. 2006-03-06 Robert Schuster <robertschuster@fsfe.org> * examples/gnu/classpath/examples/swing/TextArea.java: New file. * examples/gnu/classpath/examples/swing/Demo.java: (mkButtonBar): Changed layout manager to GridLayout, added entry for textarea example. (mkMenuBar): Added entry for text area example. 2006-03-06 Tom Tromey <tromey@redhat.com> * javax/swing/plaf/synth/Region.java (FILE_CHOOSER): Renamed. (FORMATTED_TEXT_FIELD): Likewise. 2006-03-06 Tom Tromey <tromey@redhat.com> * javax/swing/plaf/synth/SynthPainter.java: Finished. 2006-03-06 Robert Schuster <robertschuster@fsfe.org> * examples/gnu/classpath/examples/swing/Demo.java: (mkMenuBar): Added menu entry that will display the VM's name, version and distributor. 2006-03-06 Tom Tromey <tromey@redhat.com> * javax/swing/plaf/synth/SynthLookAndFeel.java (getDescription): Javadoc fix. (getName): Likewise. 2006-03-06 Raif S. Naffah <raif@swiftdsl.com.au> * java/util/jar/Manifest.java: Removed unused imports. (CRLF): New constant. (read): Added method documentation. Use UTF-8 encoding instead of 8859_1. (write): Added method documentation. Use BufferedOutputStream (w/ 4K buffer) instead of PrintWriter. (write_main_section): Replace PrintWriter arg with OutputStream. Replace JarException with IOException. (write_version_info): Likewise. (write_main_attributes): Likewise. (write_attribute_entry): Likewise. (write_individual_sections): Likewise. (write_entry_attributes): Likewise. (write_header): Replace PrintWriter arg with OutputStream. Re-implemented. 2006-03-06 David Gilbert <david.gilbert@object-refinery.com> * javax/swing/tree/FixedHeightLayoutCache.java: Reformatted and fixed API doc tag warnings, * javax/swing/tree/VariableHeightLayoutCache.java: Likewise. 2006-03-06 Dalibor Topic <robilad@kaffe.org> * gnu/java/net/protocol/file/Connection.java (unquote): Update position in buffer after decoding a unicode character outside of the basic plane. 2006-03-06 Dalibor Topic <robilad@kaffe.org> * java/net/URI.java (quote): Pass Unicode characters outside the basic plane through. 2006-03-06 Robert Schuster <robertschuster@fsfe.org> * javax/swing/plaf/basic/BasicTextUI.java: (damageRange): Rewritten if-expressions to correctly identify the break condition.
Diffstat (limited to 'gnu/java/rmi/server/CombinedClassLoader.java')
-rw-r--r--gnu/java/rmi/server/CombinedClassLoader.java20
1 files changed, 3 insertions, 17 deletions
diff --git a/gnu/java/rmi/server/CombinedClassLoader.java b/gnu/java/rmi/server/CombinedClassLoader.java
index 3d2e37d53..0a2d3baff 100644
--- a/gnu/java/rmi/server/CombinedClassLoader.java
+++ b/gnu/java/rmi/server/CombinedClassLoader.java
@@ -96,7 +96,7 @@ public class CombinedClassLoader extends ClassLoader
{
try
{
- return findClass(name);
+ return loaders[i].loadClass(name);
}
catch (ClassNotFoundException e)
{
@@ -107,27 +107,13 @@ public class CombinedClassLoader extends ClassLoader
}
/**
- * Find the library with the given name
- */
- protected String findLibrary(String name)
- {
- for (int i = 0; i < loaders.length; i++)
- {
- String lib = findLibrary(name);
- if (lib != null)
- return lib;
- }
- return super.findLibrary(name);
- }
-
- /**
* Find resource with the given name.
*/
protected URL findResource(String name)
{
for (int i = 0; i < loaders.length; i++)
{
- URL resource = findResource(name);
+ URL resource = loaders[i].getResource(name);
if (resource != null)
return resource;
}
@@ -141,7 +127,7 @@ public class CombinedClassLoader extends ClassLoader
{
for (int i = 0; i < loaders.length; i++)
{
- Enumeration resource = findResources(name);
+ Enumeration resource = loaders[i].getResources(name);
if (resource != null)
return resource;
}