harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r929043 - in /harmony/enhanced/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/archive/src/main/java/java/util/zip/ classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ classlib/modules...
Date Tue, 30 Mar 2010 08:56:59 GMT
Author: hindessm
Date: Tue Mar 30 08:56:58 2010
New Revision: 929043

URL: http://svn.apache.org/viewvc?rev=929043&view=rev
Log:
Merge changes from trunk@927846.

Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/classlib/   (props changed)
    harmony/enhanced/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Deflater.java
    harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/GZIPOutputStream.java
    harmony/enhanced/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ImageReaderSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectOutputStream.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/HashMap.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java
    harmony/enhanced/branches/java6/common_resources/   (props changed)
    harmony/enhanced/branches/java6/drlvm/   (props changed)
    harmony/enhanced/branches/java6/jdktools/   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.classpath   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.project   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/build.xml   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java   (props changed)

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-927771
+/harmony/enhanced/trunk:810871-927846

Propchange: harmony/enhanced/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
-/harmony/enhanced/trunk/classlib:810871-927771
+/harmony/enhanced/trunk/classlib:810871-927846
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/trunk/classlib/depends/libs:926318-927771
+/harmony/enhanced/trunk/classlib/depends/libs:926318-927846

Modified: harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Deflater.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Deflater.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Deflater.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Deflater.java Tue Mar 30 08:56:58 2010
@@ -75,9 +75,21 @@ public class Deflater {
      */
     public static final int NO_COMPRESSION = 0;
 
-    private static final int Z_NO_FLUSH = 0;
+    /**
+     * Use buffering for best compression.
+     */
+    static final int Z_NO_FLUSH = 0;
 
-    private static final int Z_FINISH = 4;
+    /**
+     * Flush buffers so recipients can immediately decode the data sent thus
+     * far. This mode may degrade compression.
+     */
+    static final int Z_SYNC_FLUSH = 2;
+
+    /**
+     * Flush buffers because there is no further data.
+     */
+    static final int Z_FINISH = 4;
 
     // Fill in the JNI id caches
     private static native void oneTimeInitialization();
@@ -174,24 +186,31 @@ public class Deflater {
      *            maximum number of bytes of compressed data to be written.
      * @return the number of bytes of compressed data written to {@code buf}.
      */
-    public synchronized int deflate(byte[] buf, int off, int nbytes) {
+    public int deflate(byte[] buf, int off, int nbytes) {
+        return deflate(buf, off, nbytes, flushParm);
+    }
+
+    /**
+     * @param flushParam one of {@link #Z_NO_FLUSH}, {@link #Z_FINISH} or
+     *            {@link #Z_SYNC_FLUSH}.
+     */
+    synchronized int deflate(byte[] buf, int off, int nbytes, int flushParam) {
         if (streamHandle == -1) {
             throw new IllegalStateException();
         }
         // avoid int overflow, check null buf
-        if (off <= buf.length && nbytes >= 0 && off >= 0
-                && buf.length - off >= nbytes) {
-            // put a stub buffer, no effect.
-            if (null == inputBuffer) {
-                setInput(STUB_INPUT_BUFFER);
-            }
-            return deflateImpl(buf, off, nbytes, streamHandle, flushParm);
+        if (off > buf.length || nbytes < 0 || off < 0 || buf.length - off < nbytes) {
+            throw new ArrayIndexOutOfBoundsException();
+        }
+        // put a stub buffer, no effect.
+        if (inputBuffer == null) {
+            setInput(STUB_INPUT_BUFFER);
         }
-        throw new ArrayIndexOutOfBoundsException();
+        return deflateImpl(buf, off, nbytes, streamHandle, flushParam);
     }
 
     private synchronized native int deflateImpl(byte[] buf, int off,
-            int nbytes, long handle, int flushParm1);
+            int nbytes, long handle, int flushParm);
 
     private synchronized native void endImpl(long handle);
 

Modified: harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/GZIPOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/GZIPOutputStream.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/GZIPOutputStream.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/GZIPOutputStream.java Tue Mar 30 08:56:58 2010
@@ -67,6 +67,20 @@ public class GZIPOutputStream extends De
     }
 
     /**
+     * Writes any unwritten compressed data to the underlying stream and flushes
+     * the underlying stream.
+     *
+     * @throws IOException
+     *             If an error occurs during writing.
+     */
+    @Override
+    public void flush() throws IOException {
+        int count = def.deflate(buf, 0, buf.length, Deflater.Z_SYNC_FLUSH);
+        out.write(buf, 0, count);
+        out.flush();
+    }
+
+    /**
      * Indicates to the stream that all data has been written out, and any GZIP
      * terminal data can now be written.
      *

Modified: harmony/enhanced/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java Tue Mar 30 08:56:58 2010
@@ -20,7 +20,10 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.util.zip.Checksum;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 public class GZIPOutputStreamTest extends junit.framework.TestCase {
@@ -158,6 +161,21 @@ public class GZIPOutputStreamTest extend
 		}
 	}
 
+    public void testFlush() throws IOException {
+        PipedOutputStream pout = new PipedOutputStream();
+        PipedInputStream pin = new PipedInputStream(pout);
+        GZIPOutputStream out = new GZIPOutputStream(pout);
+        GZIPInputStream in = new GZIPInputStream(pin);
+
+        out.write(1);
+        out.write(2);
+        out.write(3);
+        out.flush();
+        assertEquals(1, in.read()); // without flush, this blocks forever!!
+        assertEquals(2, in.read());
+        assertEquals(3, in.read());
+    }
+
 	@Override
     protected void setUp() {
 	}

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java Tue Mar 30 08:56:58 2010
@@ -217,14 +217,63 @@ public final class ImageIO {
                 new MIMETypeFilter(MIMEType), true));
     }
 
-    public static ImageWriter getImageWriter(ImageReader reader) throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static ImageWriter getImageWriter(ImageReader reader) {
+        if (reader == null) {
+            // imageio.97=Reader cannot be null
+            throw new IllegalArgumentException(Messages.getString("imageio.97")); //$NON-NLS-1$
+        }
+
+        ImageReaderSpi readerSpi = reader.getOriginatingProvider();
+        if (readerSpi.getImageWriterSpiNames() == null) {
+            return null;
+        }
+
+        String writerSpiName = readerSpi.getImageWriterSpiNames()[0];
+
+        Iterator<ImageWriterSpi> writerSpis;
+        writerSpis = registry.getServiceProviders(ImageWriterSpi.class, true);
+
+        try {
+            while (writerSpis.hasNext()) {
+                ImageWriterSpi writerSpi = writerSpis.next();
+                if (writerSpi.getClass().getName().equals(writerSpiName)) {
+                    return writerSpi.createWriterInstance();
+                }
+            }
+        } catch (IOException e) {
+            // Ignored
+        }
+
+        return null;
     }
 
-    public static ImageReader getImageReader(ImageWriter writer) throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static ImageReader getImageReader(ImageWriter writer) {
+        if (writer == null) {
+            // imageio.96=Writer cannot be null
+            throw new IllegalArgumentException(Messages.getString("imageio.96")); //$NON-NLS-1$
+        }
+        ImageWriterSpi writerSpi = writer.getOriginatingProvider();
+        if (writerSpi.getImageReaderSpiNames() == null) {
+            return null;
+        }
+
+        String readerSpiName = writerSpi.getImageReaderSpiNames()[0];
+
+        Iterator<ImageReaderSpi> readerSpis;
+        readerSpis = registry.getServiceProviders(ImageReaderSpi.class, true);
+
+        try {
+            while (readerSpis.hasNext()) {
+                ImageReaderSpi readerSpi = readerSpis.next();
+                if (readerSpi.getClass().getName().equals(readerSpiName)) {
+                    return readerSpi.createReaderInstance();
+                }
+            }
+        } catch (IOException e) {
+            // Ignored
+        }
+
+        return null;
     }
 
     public static Iterator<ImageWriter> getImageWriters(ImageTypeSpecifier type,

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ImageReaderSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ImageReaderSpi.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ImageReaderSpi.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ImageReaderSpi.java Tue Mar 30 08:56:58 2010
@@ -83,8 +83,7 @@ public abstract class ImageReaderSpi ext
         throw new NotImplementedException();
     }
 
-    public String[] getImageWriterSpiNames() throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public String[] getImageWriterSpiNames() {
+        return writerSpiNames;
     }
 }

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties Tue Mar 30 08:56:58 2010
@@ -164,3 +164,6 @@ imageio.92=Unknown category: {0}
 imageio.93=Illegal table size: {0}
 imageio.94=Output {0} is not supported
 imageio.95=Input is not an instance of java.io.RandomAccessFile
+imageio.96=Writer cannot be null
+imageio.97=Reader cannot be null
+

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java Tue Mar 30 08:56:58 2010
@@ -17,6 +17,8 @@
 
 package java.io;
 
+import org.apache.harmony.luni.internal.nls.Messages;
+
 /**
  * An EmulatedFieldsForDumping is an object that represents a set of emulated
  * fields for an object being dumped. It is a concrete implementation for
@@ -31,6 +33,9 @@ class EmulatedFieldsForDumping extends O
     // The actual representation, with a more powerful API (set&get)
     private EmulatedFields emulatedFields;
 
+    // Record the ObjectOutputStream that created this PutField for checking in the write method
+    private final ObjectOutputStream oos;
+
     /**
      * Constructs a new instance of EmulatedFieldsForDumping.
      * 
@@ -38,10 +43,11 @@ class EmulatedFieldsForDumping extends O
      *            a ObjectStreamClass, which describe the fields to be emulated
      *            (names, types, etc).
      */
-    EmulatedFieldsForDumping(ObjectStreamClass streamClass) {
+    EmulatedFieldsForDumping(ObjectOutputStream oos, ObjectStreamClass streamClass) {
         super();
         emulatedFields = new EmulatedFields(streamClass.fields(),
                 (ObjectStreamField[]) null);
+        this.oos = oos;
     }
 
     /**
@@ -193,6 +199,11 @@ class EmulatedFieldsForDumping extends O
     @Override
     @Deprecated
     public void write(ObjectOutput output) throws IOException {
+        if (!output.equals(oos)) {
+            // luni.E0=Attempting to write to a stream that did not create this PutField
+            throw new IllegalArgumentException(Messages.getString("luni.E0")); //$NON-NLS-1$
+        }
+
         EmulatedFields.ObjectSlot[] slots = emulatedFields.slots();
         for (int i = 0; i < slots.length; i++) {
             EmulatedFields.ObjectSlot slot = slots[i];

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectOutputStream.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectOutputStream.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectOutputStream.java Tue Mar 30 08:56:58 2010
@@ -388,7 +388,7 @@ public class ObjectOutputStream extends 
      * @see #writeFieldValues(EmulatedFieldsForDumping)
      */
     private void computePutField() {
-        currentPutField = new EmulatedFieldsForDumping(currentClass);
+        currentPutField = new EmulatedFieldsForDumping(this, currentClass);
     }
 
     /**

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/HashMap.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/HashMap.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/HashMap.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/HashMap.java Tue Mar 30 08:56:58 2010
@@ -568,10 +568,10 @@ public class HashMap<K, V> extends Abstr
             entry = findNullKeyEntry();
             if (entry == null) {
                 modCount++;
+                entry = createHashedEntry(null, 0, 0);
                 if (++elementCount > threshold) {
                     rehash();
                 }
-                entry = createHashedEntry(null, 0, 0);
             }
         } else {
             int hash = computeHashCode(key);
@@ -579,11 +579,10 @@ public class HashMap<K, V> extends Abstr
             entry = findNonNullKeyEntry(key, index, hash);
             if (entry == null) {
                 modCount++;
+                entry = createHashedEntry(key, index, hash);
                 if (++elementCount > threshold) {
                     rehash();
-                    index = hash & (elementData.length - 1);
                 }
-                entry = createHashedEntry(key, index, hash);
             }
         }
 
@@ -639,6 +638,7 @@ public class HashMap<K, V> extends Abstr
         Entry<K, V>[] newData = newElementArray(length);
         for (int i = 0; i < elementData.length; i++) {
             Entry<K, V> entry = elementData[i];
+            elementData[i] = null;
             while (entry != null) {
                 int index = entry.origKeyHash & (length - 1);
                 Entry<K, V> next = entry.next;

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties Tue Mar 30 08:56:58 2010
@@ -238,3 +238,4 @@ luni.DC=CharsetName is illegal
 luni.DD=ReadableByteChannel is null
 luni.DE=Radix {0} is less than Character.MIN_RADIX or greater than Character.MAX_RADIX
 luni.DF={0} is an illegal radix
+luni.E0=Attempting to write to a stream that did not create this PutField

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java Tue Mar 30 08:56:58 2010
@@ -1361,4 +1361,23 @@ public class ObjectOutputStreamTest exte
         assertEquals("3rd replaceObject worked incorrectly",
                 ObjectStreamClass.class, obj3.getClass());
     }
+
+    public void test_putFieldWrite() throws Exception {
+        // Regression test for HARMONY-6483
+        ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream());
+        try {
+            oos.writeObject(new OutputObject());
+            fail("Should throw an IllegalArgumentException");
+        } catch (IllegalArgumentException iae) {
+            // Expected
+        }
+    }
+
+    private static class OutputObject implements Serializable {
+        private void writeObject(ObjectOutputStream oos) throws IOException {
+            ObjectOutputStream oos2 = new ObjectOutputStream(new ByteArrayOutputStream());
+            ObjectOutputStream.PutField putField = oos.putFields();
+            putField.write(oos2);
+        }
+    }
 }

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java?rev=929043&r1=929042&r2=929043&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java Tue Mar 30 08:56:58 2010
@@ -593,6 +593,39 @@ public class HashMapTest extends junit.f
 	}
 
 	/**
+	 * Compatibility test to ensure we rehash the same way as the RI.
+	 * Not required by the spec, but some apps seem sensitive to it.
+	 */
+    public void test_rehash() {
+        // This map should rehash on adding the ninth element.
+        HashMap<MyKey, Integer> hm = new HashMap<MyKey, Integer>(10, 0.5f);
+
+        // Ordered set of keys.
+        MyKey[] keyOrder = new MyKey[9];
+        for (int i = 0; i < keyOrder.length; i++) {
+            keyOrder[i] = new MyKey();
+        }
+
+        // Store eight elements
+        for (int i = 0; i < 8; i++) {
+            hm.put(keyOrder[i], i);
+        }
+        // Check expected ordering (inverse of adding order)
+        MyKey[] returnedKeys = hm.keySet().toArray(new MyKey[8]);
+        for (int i = 0; i < 8; i++) {
+            assertSame(keyOrder[i], returnedKeys[7 - i]);
+        }
+
+        // The next put causes a rehash
+        hm.put(keyOrder[8], 8);
+        // Check expected new ordering (adding order)
+        returnedKeys = hm.keySet().toArray(new MyKey[8]);
+        for (int i = 0; i < 9; i++) {
+            assertSame(keyOrder[i], returnedKeys[i]);
+        }
+    }
+
+	/**
 	 * @tests java.util.HashMap#size()
 	 */
 	public void test_size() {

Propchange: harmony/enhanced/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/trunk/common_resources:476396-920147,921783-927771
+/harmony/enhanced/trunk/common_resources:476396-920147,921783-927846
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Propchange: harmony/enhanced/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/trunk/drlvm:810871-927771
+/harmony/enhanced/trunk/drlvm:810871-927846
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Propchange: harmony/enhanced/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/jdktools/trunk:630107-925933
-/harmony/enhanced/trunk/jdktools:926309-927771
+/harmony/enhanced/trunk/jdktools:926309-927846
 /harmony/enhanced/trunk/working_jdktools:476396-920147
 /incubator/harmony/enhanced/trunk/working_jdktools:423974-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 08:56:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:926309-927771
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:926309-927846
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:467609-476394



Mime
View raw message