Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 83940 invoked from network); 19 Dec 2006 12:24:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Dec 2006 12:24:54 -0000 Received: (qmail 44985 invoked by uid 500); 19 Dec 2006 12:25:01 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 44955 invoked by uid 500); 19 Dec 2006 12:25:01 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 44940 invoked by uid 99); 19 Dec 2006 12:25:01 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Dec 2006 04:25:01 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Dec 2006 04:24:53 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id BF3E71A981A; Tue, 19 Dec 2006 04:24:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r488656 - in /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util: Formatter.java GregorianCalendar.java HashMap.java Hashtable.java Properties.java Vector.java WeakHashMap.java Date: Tue, 19 Dec 2006 12:24:04 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061219122404.BF3E71A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Tue Dec 19 04:24:03 2006 New Revision: 488656 URL: http://svn.apache.org/viewvc?view=rev&rev=488656 Log: Apply patch for HARMONY-2383 ([classlib] [luni] Fixes for some minor issues in the java.util package found by Melody) Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Formatter.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/GregorianCalendar.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/HashMap.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Properties.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Vector.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/WeakHashMap.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Formatter.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Formatter.java?view=diff&rev=488656&r1=488655&r2=488656 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Formatter.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Formatter.java Tue Dec 19 04:24:03 2006 @@ -1025,7 +1025,7 @@ // only '-' is valid for flags if (FormatToken.FLAGS_UNSET != flags && FormatToken.FLAG_MINUS != flags) { throw new FormatFlagsConversionMismatchException(formatToken - .getStrFlags().toString(), formatToken + .getStrFlags(), formatToken .getConversionType()); } @@ -1110,8 +1110,7 @@ int flags = formatToken.getFlags(); if (FormatToken.FLAGS_UNSET != flags) { - throw new IllegalFormatFlagsException(formatToken.getStrFlags() - .toString()); + throw new IllegalFormatFlagsException(formatToken.getStrFlags()); } if (null == lineSeparator) { @@ -1212,9 +1211,9 @@ } if ('d' != currentConversionType) { if (formatToken.isFlagSet(FormatToken.FLAG_ADD) - | formatToken.isFlagSet(FormatToken.FLAG_SPACE) - | formatToken.isFlagSet(FormatToken.FLAG_COMMA) - | formatToken.isFlagSet(FormatToken.FLAG_PARENTHESIS)) { + || formatToken.isFlagSet(FormatToken.FLAG_SPACE) + || formatToken.isFlagSet(FormatToken.FLAG_COMMA) + || formatToken.isFlagSet(FormatToken.FLAG_PARENTHESIS)) { throw new FormatFlagsConversionMismatchException( formatToken.getStrFlags(), formatToken .getConversionType()); @@ -2086,7 +2085,7 @@ private void transform_N() { // TODO System.nanoTime(); - long nanosecond = calendar.get(Calendar.MILLISECOND) * 1000000; + long nanosecond = calendar.get(Calendar.MILLISECOND) * 1000000L; result.append(paddingZeros(nanosecond, 9)); } Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/GregorianCalendar.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/GregorianCalendar.java?view=diff&rev=488656&r1=488655&r2=488656 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/GregorianCalendar.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/GregorianCalendar.java Tue Dec 19 04:24:03 2006 @@ -719,8 +719,8 @@ timeVal += days * 86400000; // Use local time to compare with the gregorian change if (year == changeYear - && timeVal >= gregorianCutover + julianError() * 86400000) { - timeVal -= julianError() * 86400000; + && timeVal >= gregorianCutover + julianError() * 86400000L) { + timeVal -= julianError() * 86400000L; } // It is not possible to simply subtract getOffset(timeVal) from timeVal Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/HashMap.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/HashMap.java?view=diff&rev=488656&r1=488655&r2=488656 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/HashMap.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/HashMap.java Tue Dec 19 04:24:03 2006 @@ -526,7 +526,7 @@ index = key == null ? 0 : (key.hashCode() & 0x7FFFFFFF) % elementData.length; } - entry = createEntry(key, index, value); + createEntry(key, index, value); return null; } Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java?view=diff&rev=488656&r1=488655&r2=488656 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java Tue Dec 19 04:24:03 2006 @@ -439,33 +439,39 @@ return new Collections.SynchronizedSet>(new AbstractSet>() { @Override public int size() { - return elementCount; + synchronized (Hashtable.this) { + return elementCount; + } } @Override public void clear() { - Hashtable.this.clear(); + Hashtable.this.clear(); } @Override @SuppressWarnings("unchecked") public boolean remove(Object object) { - if (contains(object)) { - Hashtable.this.remove(((Map.Entry)object).getKey()); - return true; - } - return false; + synchronized (Hashtable.this) { + if (contains(object)) { + Hashtable.this.remove(((Map.Entry)object).getKey()); + return true; + } + return false; + } } @Override @SuppressWarnings("unchecked") public boolean contains(Object object) { - Entry entry = getEntry(((Map.Entry)object).getKey()); - return object.equals(entry); + synchronized (Hashtable.this) { + Entry entry = getEntry(((Map.Entry)object).getKey()); + return object.equals(entry); + } } @Override - public Iterator> iterator() { + public Iterator> iterator() { return new HashIterator>(new MapEntry.Type, K, V>() { public Map.Entry get(MapEntry entry) { return entry; @@ -614,26 +620,32 @@ new AbstractSet() { @Override public boolean contains(Object object) { - return containsKey(object); + synchronized (Hashtable.this) { + return containsKey(object); + } } @Override public int size() { - return elementCount; + synchronized (Hashtable.this) { + return elementCount; + } } @Override public void clear() { - Hashtable.this.clear(); + Hashtable.this.clear(); } @Override public boolean remove(Object key) { - if (containsKey(key)) { - Hashtable.this.remove(key); - return true; - } - return false; + synchronized (Hashtable.this) { + if (containsKey(key)) { + Hashtable.this.remove(key); + return true; + } + return false; + } } @Override @@ -843,17 +855,21 @@ return new Collections.SynchronizedCollection(new AbstractCollection() { @Override public boolean contains(Object object) { - return Hashtable.this.contains(object); + synchronized (Hashtable.this) { + return Hashtable.this.contains(object); + } } @Override public int size() { - return elementCount; + synchronized (Hashtable.this) { + return elementCount; + } } @Override public void clear() { - Hashtable.this.clear(); + Hashtable.this.clear(); } @Override Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Properties.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Properties.java?view=diff&rev=488656&r1=488655&r2=488656 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Properties.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Properties.java Tue Dec 19 04:24:03 2006 @@ -58,7 +58,7 @@ private static final long serialVersionUID = 4112578634029874840L; - private DocumentBuilder builder = null; + private transient DocumentBuilder builder = null; private static final String PROP_DTD_NAME = "http://java.sun.com/dtd/properties.dtd"; @@ -462,7 +462,7 @@ * the value * @return the old value mapped to the key, or null */ - public synchronized Object setProperty(String name, String value) { + public Object setProperty(String name, String value) { return put(name, value); } Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Vector.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Vector.java?view=diff&rev=488656&r1=488655&r2=488656 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Vector.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Vector.java Tue Dec 19 04:24:03 2006 @@ -342,7 +342,9 @@ int pos = 0; public boolean hasMoreElements() { - return pos < elementCount; + synchronized (Vector.this) { + return pos < elementCount; + } } public E nextElement() { Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/WeakHashMap.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/WeakHashMap.java?view=diff&rev=488656&r1=488655&r2=488656 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/WeakHashMap.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/WeakHashMap.java Tue Dec 19 04:24:03 2006 @@ -43,7 +43,7 @@ private int threshold; - transient int modCount; + volatile int modCount; //Simple utility method to isolate unchecked cast for array creation @SuppressWarnings("unchecked")