On Friday 06 April 2007 16:54, Mark Wielaard wrote: > Hi, > > This fixes --enable-collections by adding the new java.util classes and > by using Iterators explicitly (not through the enhanced for-loop which > only works with java.lang.Iterable). But I am not sure it really makes > sense to keep this supported. Could someone that uses it test that it > still works as expected? > > 2007-04-06 Mark Wielaard <[EMAIL PROTECTED]> > > * lib/mkcollections.pl.in: Add externalclasses. > * java/util/Collections.java: Unroll enhanced for loops. > * java/util/HashMap.java: Likewise. > * java/util/Hashtable.java: Likewise. > * java/util/TreeMap.java: Likewise. > > Committed, > > Mark
Mark,
Did you run a VM with this patch applied? It breaks a normal build, due to a
redundant semi-colon in Hashtable, which causes it to go into an infinite
loop when populating Properties.
Patch attached.
2007-04-06 Andrew John Hughes <[EMAIL PROTECTED]>
* java/util/Hashtable.java:
(putAllInternal(Map)): Remove redundant semi-colon.
--
Andrew :-)
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: java/util/Hashtable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Hashtable.java,v
retrieving revision 1.41
diff -u -3 -p -u -r1.41 Hashtable.java
--- java/util/Hashtable.java 6 Apr 2007 15:56:26 -0000 1.41
+++ java/util/Hashtable.java 6 Apr 2007 17:36:22 -0000
@@ -859,7 +859,7 @@ public class Hashtable<K, V> extends Dic
final Map<K,V> addMap = (Map<K,V>) m;
final Iterator<Map.Entry<K,V>> it = addMap.entrySet().iterator();
size = 0;
- while (it.hasNext());
+ while (it.hasNext())
{
final Map.Entry<K,V> e = it.next();
size++;
pgpJipL6wk9IP.pgp
Description: PGP signature
