diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-25 20:46:14 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-25 20:46:14 +0000 |
| commit | 4e9e744766fefa6bb0502a70a814f8edefee5bf6 (patch) | |
| tree | 72aeced4b22456173afeca4bc490bde4a1ef9af5 /libjava | |
| parent | 35f1a4f0ccf67e533b598fc97eeaa270442eb1b3 (diff) | |
| download | ppe42-gcc-4e9e744766fefa6bb0502a70a814f8edefee5bf6.tar.gz ppe42-gcc-4e9e744766fefa6bb0502a70a814f8edefee5bf6.zip | |
2003-09-25 Michael Koch <konqueror@gmx.de>
* java/lang/reflect/Proxy.java
(getProxyClass): Remove workaround for gcj 3.0.x.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71796 138bc75d-0d04-0410-961f-82ee72b054a4
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 c924e075724..151c76ff8af 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 9009bc8031b..03b2a45645c 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); |
