diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-09-25 20:46:14 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-09-25 20:46:14 +0000 |
| commit | 73a1415eb4165742522002a28850037448b9f477 (patch) | |
| tree | 72aeced4b22456173afeca4bc490bde4a1ef9af5 /libjava | |
| parent | 2b1be54b96a6f140291d9b84e0d55a68aa43f34e (diff) | |
| download | gcc-73a1415eb4165742522002a28850037448b9f477.zip gcc-73a1415eb4165742522002a28850037448b9f477.tar.gz gcc-73a1415eb4165742522002a28850037448b9f477.tar.bz2 | |
2003-09-25 Michael Koch <konqueror@gmx.de>
* java/lang/reflect/Proxy.java
(getProxyClass): Remove workaround for gcj 3.0.x.
From-SVN: r71796
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/reflect/Proxy.java | 15 |
2 files changed, 8 insertions, 12 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c924e07..151c76f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2003-09-25 Michael Koch <konqueror@gmx.de> + * java/lang/reflect/Proxy.java + (getProxyClass): Remove workaround for gcj 3.0.x. + +2003-09-25 Michael Koch <konqueror@gmx.de> + * gnu/java/net/PlainDatagramSocketImpl.java (finalize): Moved to directly after constructor. (getNativeFD): New method. diff --git a/libjava/java/lang/reflect/Proxy.java b/libjava/java/lang/reflect/Proxy.java index 9009bc8..03b2a45 100644 --- a/libjava/java/lang/reflect/Proxy.java +++ b/libjava/java/lang/reflect/Proxy.java @@ -269,18 +269,9 @@ public class Proxy implements Serializable ? getProxyData0(loader, interfaces) : ProxyData.getProxyData(pt)); - // FIXME workaround for bug in gcj 3.0.x - // Not needed with the latest gcj from cvs - //clazz = (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS - // ? generateProxyClass0(loader, data) - // : new ClassFactory(data).generate(loader)); - if (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS) - clazz = generateProxyClass0(loader, data); - else - { - ClassFactory cf = new ClassFactory(data); - clazz = cf.generate(loader); - } + clazz = (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS + ? generateProxyClass0(loader, data) + : new ClassFactory(data).generate(loader)); } Object check = proxyClasses.put(pt, clazz); |