Changeset 1391 for branches/GNU/src/gcc/libjava/gnu

Timestamp:

Apr 27, 2004, 8:39:34 PM (21 years ago)

Author:

bird

Message:

GCC v3.3.3 sources.

Location:

branches/GNU/src/gcc

Files:

• . (modified) (1 prop)
• libjava/gnu/awt/j2d/DirectRasterGraphics.java (modified) (2 diffs, 1 prop)
• libjava/gnu/awt/j2d/Graphics2DImpl.java (modified) (4 diffs, 1 prop)
• libjava/gnu/awt/j2d/IntegerGraphicsState.java (modified) (4 diffs, 1 prop)
• libjava/gnu/awt/xlib/XGraphics.java (modified) (2 diffs, 1 prop)
• libjava/gnu/awt/xlib/XGraphicsConfiguration.java (modified) (6 diffs, 1 prop)
• libjava/gnu/awt/xlib/XToolkit.java (modified) (5 diffs, 1 prop)
• libjava/gnu/classpath/Configuration.java.in (modified) (1 diff, 1 prop)
• libjava/gnu/gcj/convert/Output_EUCJIS.java (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/convert/Output_SJIS.java (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/convert/Output_UTF8.java (modified) (3 diffs, 1 prop)
• libjava/gnu/gcj/convert/UnicodeToBytes.java (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/convert/natIconv.cc (modified) (1 diff, 1 prop)
• libjava/gnu/gcj/protocol/core/Connection.java (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/protocol/file/Connection.java (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/protocol/http/Connection.java (modified) (7 diffs, 1 prop)
• libjava/gnu/gcj/protocol/jar/Connection.java (modified) (4 diffs, 1 prop)
• libjava/gnu/gcj/runtime/FirstThread.java (modified) (1 diff, 1 prop)
• libjava/gnu/gcj/runtime/SharedLibLoader.java (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/runtime/VMClassLoader.java (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/runtime/natSharedLibLoader.cc (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/xlib/GC.java (modified) (2 diffs, 1 prop)
• libjava/gnu/gcj/xlib/natGC.cc (modified) (3 diffs, 1 prop)
• libjava/gnu/java/lang/reflect/TypeSignature.java (modified) (3 diffs, 1 prop)
• libjava/gnu/java/rmi/dgc/DGCImpl.java (modified) (2 diffs, 1 prop)
• libjava/gnu/java/rmi/dgc/DGCImpl_Skel.java (modified) (1 diff, 1 prop)
• libjava/gnu/java/rmi/dgc/DGCImpl_Stub.java (modified) (1 diff, 1 prop)
• libjava/gnu/java/rmi/registry/RegistryImpl.java (modified) (1 diff, 1 prop)
• libjava/gnu/java/rmi/registry/RegistryImpl_Skel.java (modified) (1 diff, 1 prop)
• libjava/gnu/java/rmi/registry/RegistryImpl_Stub.java (modified) (2 diffs, 1 prop)
• libjava/gnu/java/rmi/server/RMIHashes.java (modified) (2 diffs, 1 prop)
• libjava/gnu/java/rmi/server/RMIObjectInputStream.java (modified) (2 diffs, 1 prop)
• libjava/gnu/java/rmi/server/RMIObjectOutputStream.java (modified) (3 diffs, 1 prop)
• libjava/gnu/java/rmi/server/UnicastConnection.java (modified) (11 diffs, 1 prop)
• libjava/gnu/java/rmi/server/UnicastConnectionManager.java (modified) (14 diffs, 1 prop)
• libjava/gnu/java/rmi/server/UnicastRef.java (modified) (11 diffs, 1 prop)
• libjava/gnu/java/rmi/server/UnicastRemoteCall.java (modified) (4 diffs, 1 prop)
• libjava/gnu/java/rmi/server/UnicastServer.java (modified) (7 diffs, 1 prop)
• libjava/gnu/java/rmi/server/UnicastServerRef.java (modified) (8 diffs, 1 prop)
• libjava/gnu/java/security/provider/DefaultPolicy.java (modified) (2 diffs, 1 prop)
• libjava/gnu/java/security/provider/Gnu.java (modified) (5 diffs, 1 prop)
• libjava/gnu/java/security/provider/SHA.java (modified) (3 diffs, 1 prop)
• libjava/gnu/java/security/provider/SHA1PRNG.java (modified) (6 diffs, 1 prop)
• libjava/gnu/java/text/SentenceBreakIterator.java (modified) (6 diffs, 1 prop)

branches/GNU/src/gcc

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out

branches/GNU/src/gcc/libjava/gnu/awt/j2d/DirectRasterGraphics.java

@@ -1 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -62 +62 @@
   public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints);
   
-  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints);
+  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
+                          int translateX, int translateY);
   
   public void drawString(String str, int x, int y);

branches/GNU/src/gcc/libjava/gnu/awt/j2d/Graphics2DImpl.java

@@ -1 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -10 +10 @@
 
 import java.awt.Color;
+import java.awt.Composite;
 import java.awt.Image;
 import java.awt.Shape;
@@ -20 +21 @@
 import java.awt.Paint;
 import java.awt.RenderingHints;
+import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
 import java.awt.image.ImageObserver;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.RenderedImage;
+import java.awt.image.renderable.RenderableImage;
+import java.text.AttributedCharacterIterator;
+import java.util.Map;
 
 /**
@@ -452 +460 @@
     throw new UnsupportedOperationException(msg);
   }
+  
+  public void drawImage(BufferedImage image, BufferedImageOp op, int x, int y)
+  {
+    throw new UnsupportedOperationException("not implemented yet");  
+  }
+
+  public void drawRenderedImage(RenderedImage image, AffineTransform xform)
+  {
+    throw new UnsupportedOperationException("not implemented yet");  
+  }
+
+  public void drawRenderableImage(RenderableImage image, AffineTransform xform)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void drawString(AttributedCharacterIterator iterator,
+                                  int x, int y)
+  {
+    throw new UnsupportedOperationException("not implemented yet");  
+  }
+
+  public void drawString(AttributedCharacterIterator iterator, float x, 
+                         float y)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void setComposite(Composite comp)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void setStroke(Stroke stroke)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void setRenderingHints(Map hints)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void addRenderingHints(Map hints)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public Composite getComposite()
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public Stroke getStroke()
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
 }

branches/GNU/src/gcc/libjava/gnu/awt/j2d/IntegerGraphicsState.java

@@ -1 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -213 +213 @@
   public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
   {
-    if ((tx == 0) || (ty == 0))
+    if ((tx == 0) && (ty == 0))
       {
         directGfx.drawPolyline(xPoints, yPoints, nPoints);
@@ -224 +224 @@
   public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
   {
-    if ((tx == 0) || (ty == 0))
+    if ((tx == 0) && (ty == 0))
       {
         directGfx.drawPolygon(xPoints, yPoints, nPoints);
@@ -233 +233 @@
   }
   
-  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)
-  {
-    if ((tx == 0) || (ty == 0))
-      {
-        directGfx.fillPolygon(xPoints, yPoints, nPoints);
-        return;
-      }
-    
-    throw new UnsupportedOperationException("translate not implemented");
+  public void fillPolygon (int[] xPoints, int[] yPoints, int nPoints)
+  {
+    // FIXME: remove tx & ty args once translation via AffineTransform
+    // is implemented.
+    directGfx.fillPolygon (xPoints, yPoints, nPoints, tx, ty);
   }
 

branches/GNU/src/gcc/libjava/gnu/awt/xlib/XGraphics.java

@@ -1 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -177 +177 @@
   }
     
-  public void fillPolygon(int[] xPoints, int[] yPoints, int
-                          nPoints)
-  {
-    throw new UnsupportedOperationException("not implemented");
+  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
+                          int translateX, int translateY)
+  {
+    context.fillPolygon(xPoints, yPoints, nPoints, translateX, translateY);
   }
 

branches/GNU/src/gcc/libjava/gnu/awt/xlib/XGraphicsConfiguration.java

@@ -1 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -13 +13 @@
 import java.awt.Graphics2D;
 import java.awt.Graphics;
+import java.awt.GraphicsDevice;
 import java.awt.Point;
 import java.awt.Color;
@@ -129 +130 @@
    *
    * @param offset Offset to data. The given offset does not include
-   * data buffer offset, which will also be added.  */
+   * data buffer offset, which will also be added.  
+   */
   static void attachData(XImage ximage, DataBuffer dataB, int offset)
   {
@@ -237 +239 @@
   }
 
+  /**
+   * Gets the associated device that this configuration describes.
+   *
+   * @return the device
+   */
+  public GraphicsDevice getDevice()
+  {
+    throw new UnsupportedOperationException("not implemented");  
+  }
+
+  /**
+   * Returns a buffered image optimized to this device, so that blitting can
+   * be supported in the buffered image.
+   *
+   * @param w the width of the buffer
+   * @param h the height of the buffer
+   * @return the buffered image, or null if none is supported
+   */
   public BufferedImage createCompatibleImage(int width,
                                              int height,
@@ -243 +263 @@
     throw new UnsupportedOperationException("not implemented");
   }
-    
+
+  /**
+   * Returns a buffered volatile image optimized to this device, so that
+   * blitting can be supported in the buffered image. Because the buffer is
+   * volatile, it can be optimized by native graphics accelerators.
+   *
+   * @param w the width of the buffer
+   * @param h the height of the buffer
+   * @return the buffered image, or null if none is supported
+   * @see Component#createVolatileImage(int, int)
+   * @since 1.4
+   */
+  public VolatileImage createCompatibleVolatileImage(int w, int h)
+  {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
   /**
    * FIXME: I'm not sure which color model that should be returned here.
@@ -354 +390 @@
   int getPixel(Color color)
   {
+    /* FIXME: consider an integer technique whenever
+     * the ColorModel is 8 bits per color.
+     * The problem with using integers is that it doesn't work unless
+     * the colors are 8 bits each (as in the array), since ColorModel.getDataElement(int[],int)
+     * expects non-normalized values.  For example, in a 16-bit display mode, you
+     * would typically have 5 bits each for red and blue, and 6 bits for green.
     int[] components =
-        {
-          color.getRed(),
-          color.getGreen(),
-          color.getBlue(),
-          0xff
-        };
-        
-    ColorModel cm = getColorModel();
-    return cm.getDataElement(components, 0);
+    {
+      color.getRed (),
+      color.getGreen (),
+      color.getBlue (),
+      0xff
+    };
+     */
+    
+    float[] normalizedComponents =
+    {
+      ((float)color.getRed ()) / 255F,
+      ((float)color.getGreen ()) / 255F,
+      ((float)color.getBlue ()) / 255F,
+      1
+    };
+    int[] unnormalizedComponents = { 0, 0, 0, 0xff };
+    ColorModel cm = getColorModel ();
+    cm.getUnnormalizedComponents(normalizedComponents, 0,
+                                 unnormalizedComponents, 0);
+    return cm.getDataElement (unnormalizedComponents, 0);
   }
 }

branches/GNU/src/gcc/libjava/gnu/awt/xlib/XToolkit.java

@@ -1 @@
-/* Copyright (C) 2000, 2002  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -10 +10 @@
 
 import java.awt.*;
+import java.awt.dnd.*;
+import java.awt.dnd.peer.*;
+import java.awt.im.*;
 import java.awt.peer.*;
 import java.awt.image.ImageProducer;
@@ -16 +19 @@
 import java.awt.datatransfer.Clipboard;
 import java.util.Properties;
+import java.util.Map;
 
 import gnu.gcj.xlib.Display;
@@ -170 +174 @@
   public java.awt.image.ColorModel getColorModel()
   {
-    throw new UnsupportedOperationException("not implemented yet");
+    return getDefaultXGraphicsConfiguration().getColorModel();
   }
 
@@ -319 +323 @@
   }
 
-
-    /*
-    public DragSourceContextPeer
-        createDragSourceContextPeer(DragGestureEvent dge)
-        throws InvalidDnDOperationException;
-
-    public DragGestureRecognizer
-        createDragGestureRecognizer(Class abstractRecognizerClass,
-                                    DragSource ds, Component c,
-                                    int srcActions, DragGestureListener dgl) {
-        throw new UnsupportedOperationException("not implemented");
-    }
-    */
-
-    
-    /*
-    public Map mapInputMethodHighlight(InputMethodHighlight highlight);
-    */
+  public DragSourceContextPeer
+    createDragSourceContextPeer(DragGestureEvent dge)
+    throws InvalidDnDOperationException
+  {
+    throw new UnsupportedOperationException("not implemented");  
+  }
+
+  public DragGestureRecognizer
+    createDragGestureRecognizer(Class abstractRecognizerClass,
+                                DragSource ds, Component c,
+                                int srcActions, DragGestureListener dgl)
+  {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
+    
+  public Map mapInputMethodHighlight(InputMethodHighlight highlight)
+  {
+    throw new UnsupportedOperationException("not implemented");
+  }
 }

branches/GNU/src/gcc/libjava/gnu/classpath/Configuration.java.in

@@ -52 +52 @@
   // For libgcj we never load the JNI libraries.
   boolean INIT_LOAD_LIBRARY = false;
+        
+  // For libgcj we have native methods for proxy support....
+  boolean HAVE_NATIVE_GET_PROXY_DATA = false;
+  boolean HAVE_NATIVE_GET_PROXY_CLASS = false;
+  boolean HAVE_NATIVE_GENERATE_PROXY_CLASS = false;
 }

branches/GNU/src/gcc/libjava/gnu/gcj/convert/Output_EUCJIS.java

@@ -1 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -23 +23 @@
   public native int write (String str, int inpos, int inlength, char[] work);
 
+  public boolean havePendingBytes()
+  {
+    return pending1 >= 0;
+  }
+
   int pending1 = -1;
   int pending2;

branches/GNU/src/gcc/libjava/gnu/gcj/convert/Output_SJIS.java

@@ -1 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -23 +23 @@
   public native int write (String str, int inpos, int inlength, char[] work);
 
+  public boolean havePendingBytes()
+  {
+    return pending >= 0;
+  }
+
   int pending = -1;
 }

branches/GNU/src/gcc/libjava/gnu/gcj/convert/Output_UTF8.java

@@ -1 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -105 +105 @@
                 value = (hi_part - 0xD800) * 0x400 + (ch - 0xDC00) + 0x10000;
                 buf[count++] = (byte) (0xF0 | (value >> 18));
+                avail--;
                 bytes_todo = 3;
                 hi_part = 0;
@@ -119 +120 @@
     return inpos - start_pos;
   }
+
+  public boolean havePendingBytes()
+  {
+    return bytes_todo > 0;
+  }
+
 }

branches/GNU/src/gcc/libjava/gnu/gcj/convert/UnicodeToBytes.java

@@ -1 @@
-/* Copyright (C) 1999, 2000, 2001  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -147 +147 @@
   }
 
+  /**
+   * Returns true when the converter has consumed some bytes that are
+   * not yet converted to characters because further continuation
+   * bytes are needed.  Defaults to false, should be overridden by
+   * decoders that internally store some bytes.
+   */
+  public boolean havePendingBytes()
+  {
+    return false;
+  }
+
   /** Indicate that the converter is resuable.
    * This class keeps track of converters on a per-encoding basis.

branches/GNU/src/gcc/libjava/gnu/gcj/convert/natIconv.cc

@@ -269 +269 @@
       if (r != (size_t) -1 && inc == 0 && outc == 0)
         result = (c != 0xfeff);
+
+      // Release iconv handle.
+      iconv_close (handle);
     }
 #endif /* HAVE_ICONV */

branches/GNU/src/gcc/libjava/gnu/gcj/protocol/core/Connection.java

@@ -14 +14 @@
 import java.net.*;
 import java.io.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
@@ -70 +71 @@
       }
     return (String) hdrHash.get(name.toLowerCase());
+  }
+
+  // Override default method in URLConnection.
+  public Map getHeaderFields()
+  {
+    try
+      {
+        getHeaders();
+      }
+    catch (IOException x)
+      {
+        return null;
+      }
+    return hdrHash;
   }
 

branches/GNU/src/gcc/libjava/gnu/gcj/protocol/file/Connection.java

@@ -13 +13 @@
 import java.net.*;
 import java.io.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
@@ -97 +98 @@
 
   // Override default method in URLConnection.
+  public Map getHeaderFields()
+  {
+    try
+      {
+        getHeaders();
+      }
+    catch (IOException x)
+      {
+        return null;
+      }
+    return hdrHash;
+  }
+
+  // Override default method in URLConnection.
   public String getHeaderField(int n)
   {

branches/GNU/src/gcc/libjava/gnu/gcj/protocol/http/Connection.java

@@ -1 +1 @@
 // Connection.java - Implementation of HttpURLConnection for http protocol.
 
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -13 +13 @@
 import java.net.*;
 import java.io.*;
+import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
@@ -25 +26 @@
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
- * Status:  Minimal subset of functionality.  Proxies and Redirects
- *      not yet handled.  FileNameMap handling needs to be considered.
- *      useCaches, ifModifiedSince, and allowUserInteraction need
- *      consideration as well as doInput and doOutput.
+ * Status: Minimal subset of functionality.  Proxies only partially
+ * handled; Redirects not yet handled.  FileNameMap handling needs to
+ * be considered.  useCaches, ifModifiedSince, and
+ * allowUserInteraction need consideration as well as doInput and
+ * doOutput.
  */
 
@@ -40 +42 @@
   private BufferedInputStream bufferedIn;
 
+  private static int proxyPort = 80;
+  private static boolean proxyInUse = false;
+  private static String proxyHost = null;
+
+  static 
+  {
+    // Recognize some networking properties listed at
+    // http://java.sun.com/j2se/1.4/docs/guide/net/properties.html.
+    String port = null;
+    proxyHost = System.getProperty("http.proxyHost");
+    if (proxyHost != null)
+      {
+        proxyInUse = true;
+        if ((port = System.getProperty("http.proxyPort")) != null)
+          {
+            try
+              {
+                proxyPort = Integer.parseInt(port);
+              }
+            catch (Throwable t)
+              {
+                // Nothing.  
+              }
+          }
+      }
+  }
+
   public Connection(URL url)
   {
@@ -85 +114 @@
     // Get address and port number.
     int port;
-    InetAddress destAddr = InetAddress.getByName(url.getHost());
-    if ((port = url.getPort()) == -1)
-      port = 80;
-
-    // Open socket and output stream.
-    sock = new Socket(destAddr, port);
+    if (proxyInUse)
+      {
+        port = proxyPort;
+        sock = new Socket(proxyHost, port);
+      }
+    else
+      {
+        InetAddress destAddr = InetAddress.getByName(url.getHost());
+        if ((port = url.getPort()) == -1)
+          port = 80;
+        // Open socket and output stream.
+        sock = new Socket(destAddr, port);
+      }
+
     PrintWriter out = new PrintWriter(sock.getOutputStream());
 
@@ -123 +160 @@
   }
 
-  // TODO: public boolean usingProxy()
   public boolean usingProxy()
   {
-    return false;
+    return proxyInUse;
   }
 
@@ -166 +202 @@
 
     return (String) hdrHash.get(name.toLowerCase());
+  }
+
+  // Override default method in URLConnection.
+  public Map getHeaderFields()
+  {
+    if (!connected)
+      try
+        {
+          connect();
+        }
+      catch (IOException x)
+        {
+          return null;
+        }
+
+    return hdrHash;
   }
 

branches/GNU/src/gcc/libjava/gnu/gcj/protocol/jar/Connection.java

@@ -1 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2002  Free Software Foundation
 
    This file is part of libgcj.
@@ -10 +10 @@
 
 import java.net.URL;
+import java.net.URLConnection;
 import java.net.JarURLConnection;
 import java.net.URLStreamHandler;
@@ -15 +16 @@
 import java.net.ProtocolException;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.util.jar.JarFile;
+import java.util.zip.ZipFile;
 import java.util.Hashtable;
 
 /**
  * Written using on-line Java Platform 1.2 API Specification.
- * Status: Needs a way to download jar files and store them in the local file
- * system.  I don't know how to do that in a portable way.  For now, it can only handle 
- * connections to a jar:file: url's.
  *
  * @author Kresten Krab Thorup <krab@gnu.org>
@@ -71 +73 @@
     else
       {
-        /*
-          FIXME: Here we need to download and cache the jar
-          file in the local file system!  Stupid design.  Why
-          can't we just create a JarFile from a bag of bytes?
-        */
-
-        throw new java.io.IOException("cannot create jar file from " +
-                                      jarFileURL);
+        URLConnection urlconn = jarFileURL.openConnection();
+        InputStream is = urlconn.getInputStream();
+        byte[] buf = new byte[4*1024];
+        File f = File.createTempFile("cache", "jar");
+        FileOutputStream fos = new FileOutputStream(f);
+        int len = 0;
+        while((len = is.read(buf)) != -1)
+          fos.write(buf, 0, len);
+        fos.close();
+        // Always verify the Manifest, open read only and delete when done.
+        // XXX ZipFile.OPEN_DELETE not yet implemented.
+        // jf = new JarFile(f, true, ZipFile.OPEN_READ | ZipFile.OPEN_DELETE);
+        jarfile = new JarFile(f, true, ZipFile.OPEN_READ);
       }
 

branches/GNU/src/gcc/libjava/gnu/gcj/runtime/FirstThread.java

@@ -95 +95 @@
   static final Class Khttp = gnu.gcj.protocol.http.Handler.class;
   static final Class Kjar  = gnu.gcj.protocol.jar.Handler.class;
+  static final Class KinputASCII  = gnu.gcj.convert.Input_ASCII.class;
+  static final Class KoutputASCII = gnu.gcj.convert.Output_ASCII.class;
 }

branches/GNU/src/gcc/libjava/gnu/gcj/runtime/SharedLibLoader.java

@@ -1 @@
-/* Copyright (C) 2001  Free Software Foundation
+/* Copyright (C) 2001, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -28 +28 @@
    * @param libname named of shared library (passed to dlopen)
    * @param parent the parent ClassLoader
-   * @parem flags passed to dlopen
+   * @param flags passed to dlopen
    */
   public SharedLibLoader(String libname, ClassLoader parent, int flags)

branches/GNU/src/gcc/libjava/gnu/gcj/runtime/VMClassLoader.java

@@ -1 @@
-/* Copyright (C) 1999, 2001  Free Software Foundation
+/* Copyright (C) 1999, 2001, 2002  Free Software Foundation
 
    This file is part of libgcj.
@@ -34 +34 @@
         try
           {
-            if (e.endsWith(".jar") || e.endsWith (".zip"))
-              {
-                File archive = new File (e);
-                try {
-                  p.addElement(new URL("jar", "", -1, "file://"
-                                       + archive.getCanonicalPath ()
-                                       + "!/"));
-                } catch (IOException ex) {
-                  // empty
-                }
-              }
-            else if (e.endsWith ("/"))
+            if (!e.endsWith (File.separator) && new File (e).isDirectory ())
+              p.addElement (new URL("file", "", -1, e + File.separator));
+            else
               p.addElement (new URL("file", "", -1, e));
-            else if (new File (e).isDirectory ())
-              p.addElement (new URL("file", "", -1, e + "/"));
-            else
-              /* Ignore path element. */;
           } 
         catch (java.net.MalformedURLException x)

branches/GNU/src/gcc/libjava/gnu/gcj/runtime/natSharedLibLoader.cc

@@ -1 +1 @@
 // natSharedLibLoader.cc - Implementation of FirstThread native methods.
 
-/* Copyright (C) 2001  Free Software Foundation
+/* Copyright (C) 2001, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -63 +63 @@
   handler = (gnu::gcj::RawData*) h;
 #else
-  const char *msg = "ShareedLibLoader is not supported on this platform";
+  const char *msg = "SharedLibLoader is not supported on this platform";
   throw new java::lang::UnsupportedOperationException(JvNewStringLatin1(msg));
 #endif

branches/GNU/src/gcc/libjava/gnu/gcj/xlib/GC.java

@@ -1 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -85 +85 @@
 
   public native void fillRectangle(int x, int y, int w, int h);
+  public native void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
+                                 int translateX, int translateY);
 
   /** 

branches/GNU/src/gcc/libjava/gnu/gcj/xlib/natGC.cc

@@ -1 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
@@ -12 +12 @@
 
 #include <gcj/cni.h>
+#include <gcj/array.h>
 #include <gnu/gcj/RawData.h>
 #include <java/lang/String.h>
@@ -155 +156 @@
 }
 
+void gnu::gcj::xlib::GC::fillPolygon(jintArray xPoints, jintArray yPoints,
+                                     jint nPoints,
+                                     jint translateX, jint translateY)
+{
+  Display* display = target->getDisplay();
+  ::Display* dpy = (::Display*) (display->display);
+  ::Drawable drawableXID = target->getXID();
+  ::GC gc = (::GC) structure;
+  typedef ::XPoint xpoint;
+  std::vector<xpoint> points(nPoints+1);
+  for (int i=0; i<nPoints; i++)
+    {
+      points[i].x = elements(xPoints)[i] + translateX;
+      points[i].y = elements(yPoints)[i] + translateY;
+    }
+  points[nPoints] = points[0];
+  XFillPolygon(dpy, drawableXID, gc, &(points.front()), nPoints,
+               Complex, CoordModeOrigin);
+  // no fast fail
+}
+
 void gnu::gcj::xlib::GC::clearArea(jint x, jint y, jint w, jint h,
                                    jboolean exposures)

branches/GNU/src/gcc/libjava/gnu/java/lang/reflect/TypeSignature.java

@@ -1 +1 @@
 /* TypeSignature.java -- Class used to compute type signatures
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -8 +8 @@
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45 +45 @@
 
 /**
-   This class provides static methods that can be used to compute
-   type-signatures of <code>Class</code>s or <code>Member</code>s.
-   More specific methods are also provided for computing the
-   type-signature of <code>Constructor</code>s and
-   <code>Method</code>s.  Methods are also provided to go in the
-   reverse direction.
-*/
+ * This class provides static methods that can be used to compute
+ * type-signatures of <code>Class</code>s or <code>Member</code>s.
+ * More specific methods are also provided for computing the
+ * type-signature of <code>Constructor</code>s and
+ * <code>Method</code>s.  Methods are also provided to go in the
+ * reverse direction.
+ *
+ * @author Eric Blake <ebb9@email.byu.edu>
+ */
 public class TypeSignature
 {
- 
-  /**
-     Returns a <code>String</code> representing the type-encoding of
-     CLAZZ.  Type-encodings are computed as follows:
-
-     <pre>
-     boolean -> "Z"
-     byte    -> "B"
-     char    -> "C"
-     double  -> "D"
-     float   -> "F"
-     int     -> "I"
-     long    -> "J"
-     short   -> "S"
-     void    -> "V"
-     arrays  -> "[" + type-encoding of component type
-     object  -> "L"
-                 + fully qualified class name with "."'s replaced by "/"'s
-                 + ";"</pre>
-  */
-  public static String getEncodingOfClass( Class clazz )
-  {
-    if( clazz.isPrimitive() )
-    {
-      if( clazz == Boolean.TYPE )
-        return "Z";
-      if( clazz == Byte.TYPE )
-        return "B";
-      if( clazz == Character.TYPE )
-        return "C";
-      if( clazz == Double.TYPE )
-        return "D";
-      if( clazz == Float.TYPE )
-        return "F";
-      if( clazz == Integer.TYPE )
-        return "I";
-      if( clazz == Long.TYPE )
-        return "J";
-      if( clazz == Short.TYPE )
-        return "S";
-      if( clazz == Void.TYPE )
-        return "V";
-      else
-        throw new RuntimeException( "Unknown primitive class " + clazz );
-    }
-    else if( clazz.isArray() )
-    {
-      return '[' + getEncodingOfClass( clazz.getComponentType() );
-    }
-    else
-    {
-      String classname = clazz.getName();
-      int name_len = classname.length();
-      char[] buf = new char[ name_len + 2 ];
-      buf[0] = 'L';
-      classname.getChars( 0, name_len, buf, 1 );
-      
-      int i;
-      for( i=1; i <= name_len; i++ )
+  /**
+   * Returns a <code>String</code> representing the type-encoding of a class.
+   * The .class file format has different encodings for classes, depending
+   * on whether it must be disambiguated from primitive types or not; hence
+   * the descriptor parameter to choose between them. If you are planning
+   * on decoding primitive types along with classes, then descriptor should
+   * be true for correct results. Type-encodings are computed as follows:
+   *
+   * <pre>
+   * boolean -> "Z"
+   * byte    -> "B"
+   * char    -> "C"
+   * double  -> "D"
+   * float   -> "F"
+   * int     -> "I"
+   * long    -> "J"
+   * short   -> "S"
+   * void    -> "V"
+   * arrays  -> "[" + descriptor format of component type
+   * object  -> class format: fully qualified name with '.' replaced by '/'
+   *            descriptor format: "L" + class format + ";"
+   * </pre>
+   *
+   * @param type the class name to encode
+   * @param descriptor true to return objects in descriptor format
+   * @return the class name, as it appears in bytecode constant pools
+   * @see #getClassForEncoding(String)
+   */
+  public static String getEncodingOfClass(String type, boolean descriptor)
+  {
+    if (! descriptor || type.charAt(0) == '[')
+      return type.replace('.', '/');
+    if (type.equals("boolean"))
+      return "Z";
+    if (type.equals("byte"))
+      return "B";
+    if (type.equals("short"))
+      return "S";
+    if (type.equals("char"))
+      return "C";
+    if (type.equals("int"))
+      return "I";
+    if (type.equals("long"))
+      return "J";
+    if (type.equals("float"))
+      return "F";
+    if (type.equals("double"))
+      return "D";
+    if (type.equals("void"))
+      return "V";
+    return 'L' + type.replace('.', '/') + ';';
+  }
+
+  /**
+   * Gets the descriptor encoding for a class.
+   *
+   * @param clazz the class to encode
+   * @param descriptor true to return objects in descriptor format
+   * @return the class name, as it appears in bytecode constant pools
+   * @see #getEncodingOfClass(String, boolean)
+   */
+  public static String getEncodingOfClass(Class clazz, boolean descriptor)
+  {
+    return getEncodingOfClass(clazz.getName(), descriptor);
+  }
+
+  /**
+   * Gets the descriptor encoding for a class.
+   *
+   * @param clazz the class to encode
+   * @return the class name, as it appears in bytecode constant pools
+   * @see #getEncodingOfClass(String, boolean)
+   */
+  public static String getEncodingOfClass(Class clazz)
+  {
+    return getEncodingOfClass(clazz.getName(), true);
+  }
+
+
+  /**
+   * This function is the inverse of <code>getEncodingOfClass</code>. This
+   * accepts both object and descriptor formats, but must know which style
+   * of string is being passed in (usually, descriptor should be true). In
+   * descriptor format, "I" is treated as int.class, in object format, it
+   * is treated as a class named I in the unnamed package.
+   *
+   * @param type_code the class name to decode
+   * @param descriptor if the string is in descriptor format
+   * @return the corresponding Class object
+   * @throws ClassNotFoundException if the class cannot be located
+   * @see #getEncodingOfClass(Class, boolean)
+   */
+  public static Class getClassForEncoding(String type_code, boolean descriptor)
+    throws ClassNotFoundException
+  {
+    if (descriptor)
       {
-        if( buf[i] == '.' )
-          buf[i] = '/';
+        switch (type_code.charAt(0))
+          {
+          case 'B':
+            return byte.class;
+          case 'C':
+            return char.class;
+          case 'D':
+            return double.class;
+          case 'F':
+            return float.class;
+          case 'I':
+            return int.class;
+          case 'J':
+            return long.class;
+          case 'S':
+            return short.class;
+          case 'V':
+            return void.class;
+          case 'Z':
+            return boolean.class;
+          default:
+            throw new ClassNotFoundException("Invalid class name: "
+                                             + type_code);
+          case 'L':
+            type_code = type_code.substring(1, type_code.length() - 1);
+            // Fallthrough.
+          case '[':
+          }
       }
-      
-      buf[i] = ';';
-      return new String( buf );
-    }
-  }
-
-  
-  /**
-     This function is the inverse of <code>getEncodingOfClass</code>.
-
-     @see getEncodingOfClass
-
-     @exception ClassNotFoundException If class encoded as type_code
-     cannot be located.
-  */
-  public static Class getClassForEncoding( String type_code )
+    return Class.forName(type_code.replace('/', '.'));
+  }
+
+  /**
+   * Gets the Class object for a type name.
+   *
+   * @param type_code the class name to decode
+   * @return the corresponding Class object
+   * @throws ClassNotFoundException if the class cannot be located
+   * @see #getClassForEncoding(String, boolean)
+   */
+  public static Class getClassForEncoding(String type_code)
     throws ClassNotFoundException
   {
-    if( type_code.equals( "B" ) )
-      return Byte.TYPE;
-    if( type_code.equals( "C" ) )
-      return Character.TYPE;
-    if( type_code.equals( "D" ) )
-      return Double.TYPE;
-    if( type_code.equals( "F" ) )
-      return Float.TYPE;
-    if( type_code.equals( "I" ) )
-      return Integer.TYPE;
-    if( type_code.equals( "J" ) )
-      return Long.TYPE;
-    if( type_code.equals( "S" ) )
-      return Short.TYPE;
-    if( type_code.equals( "Z" ) )
-      return Boolean.TYPE;
-    if( type_code.charAt( 0 ) == 'L' )
-    {
-      return Class.forName(
-        type_code.substring( 1, type_code.length() - 1 ).replace( '/', '.' ));
-    }
-    if( type_code.charAt( 0 ) == '[' )
-    {
-      int last_bracket = type_code.lastIndexOf( '[' );
-      String brackets = type_code.substring( 0, last_bracket + 1 );
-      String component = type_code.substring( last_bracket + 1 );
-      
-// ??? This is what the Classpath implementation did, but I don't
-// think that it's correct.  The JLS says that Class.forName takes the
-// classname of an array element in fully qualified form, whereas this
-// code is tring to strip off the punctuation.
-
-//        if( component.charAt( 0 ) == 'L' )
-//      component =
-//        component.substring( 1, component.length() - 1 ).replace('/', '.');
-
-      if( component.charAt( 0 ) == 'L' )
-        component = component.replace('/', '.');
-        
-      return Class.forName( brackets + component );
-    }
-    else
-      throw new ClassNotFoundException( "Type code cannot be parsed as a valid class name" );
-  }
-  
-
-  /**
-     Returns a <code>String</code> representing the type-encoding of
-     M.  The type-encoding of a method is:
-
-     "(" + type-encodings of parameter types + ")" 
-     + type-encoding of return type
-  */
-  public static String getEncodingOfMethod( Method m )
-  {
-    String returnEncoding = getEncodingOfClass( m.getReturnType() );
+    return getClassForEncoding(type_code, true);
+  }
+
+  /**
+   * Returns a <code>String</code> representing the type-encoding of a
+   * method.  The type-encoding of a method is:
+   *
+   * "(" + parameter type descriptors + ")" + return type descriptor
+   *
+   * XXX This could be faster if it were implemented natively.
+   *
+   * @param m the method to encode
+   * @return the encoding
+   */
+  public static String getEncodingOfMethod(Method m)
+  {
     Class[] paramTypes = m.getParameterTypes();
-    String[] paramEncodings = new String[ paramTypes.length ];
-
-    String paramEncoding;
-    int size = 2; // make room for parens
-    for( int i=0; i < paramTypes.length; i++ )
-    {
-      paramEncoding = getEncodingOfClass( paramTypes[i] );
-      size += paramEncoding.length();
-      paramEncodings[i] = paramEncoding;
-    }
-    
-    size += returnEncoding.length();
-
-    StringBuffer buf = new StringBuffer( size );
-    buf.append( '(' );
-    
-    for( int i=0; i < paramTypes.length; i++ )
-    {
-      buf.append( paramEncodings[i] );
-    }
-    
-    buf.append( ')' );
-    buf.append( returnEncoding );
-    
+    StringBuffer buf = new StringBuffer().append('(');
+    for (int i = 0; i < paramTypes.length; i++)
+      buf.append(getEncodingOfClass(paramTypes[i].getName(), true));
+    buf.append(')').append(getEncodingOfClass(m.getReturnType().getName(),
+                                              true));
     return buf.toString();
   }
 
-
-  /**
-     Returns a <code>String</code> representing the type-encoding of
-     C.  The type-encoding of a method is:
-
-     "(" + type-encodings of parameter types + ")V" 
-  */
-  public static String getEncodingOfConstructor( Constructor c )
+  /**
+   * Returns a <code>String</code> representing the type-encoding of a
+   * constructor. The type-encoding of a method is:
+   *
+   * "(" + parameter type descriptors + ")V"
+   *
+   * XXX This could be faster if it were implemented natively.
+   *
+   * @param c the constructor to encode
+   * @return the encoding
+   */
+  public static String getEncodingOfConstructor(Constructor c)
   {
     Class[] paramTypes = c.getParameterTypes();
-    String[] paramEncodings = new String[ paramTypes.length ];
-
-    String paramEncoding;
-    int size = 3; // make room for parens and V for return type
-    for( int i=0; i < paramTypes.length; i++ )
-    {
-      paramEncoding = getEncodingOfClass( paramTypes[i] );
-      size += paramEncoding.length();
-      paramEncodings[i] = paramEncoding;
-    }
-    
-    StringBuffer buf = new StringBuffer( size );
-    buf.append( '(' );
-    
-    for( int i=0; i < paramTypes.length; i++ )
-    {
-      buf.append( paramEncodings[i] );
-    }
-    
-    buf.append( ")V" );
-    
+    StringBuffer buf = new StringBuffer().append('(');
+    for (int i = 0; i < paramTypes.length; i++)
+      buf.append(getEncodingOfClass(paramTypes[i].getName(), true));
+    buf.append(")V");
     return buf.toString();
   }
 
-
-  /**
-     Returns a <code>String</code> representing the type-encoding of
-     MEM.  <code>Constructor</code>s are handled by
-     <code>getEncodingOfConstructor</code>.  <code>Method</code>s are
-     handled by <code>getEncodingOfMethod</code>.  <code>Field</code>s
-     are handled by returning the encoding of the type of the
-     <code>Field</code>.
-  */
-  public static String getEncodingOfMember( Member mem )
-  {
-    if( mem instanceof Constructor )
-      return getEncodingOfConstructor( (Constructor)mem );
-    if( mem instanceof Method )
-      return getEncodingOfMethod( (Method)mem );
+  /**
+   * Returns a <code>String</code> representing the type-encoding of a
+   * class member. This appropriately handles Constructors, Methods, and
+   * Fields.
+   *
+   * @param mem the member to encode
+   * @return the encoding
+   */
+  public static String getEncodingOfMember(Member mem)
+  {
+    if (mem instanceof Constructor)
+      return getEncodingOfConstructor((Constructor) mem);
+    if (mem instanceof Method)
+      return getEncodingOfMethod((Method) mem);
     else // Field
-      return getEncodingOfClass( ((Field)mem).getType() );
-  }
-}
+      return getEncodingOfClass(((Field) mem).getType().getName(), true);
+  }
+} // class TypeSignature

branches/GNU/src/gcc/libjava/gnu/java/rmi/dgc/DGCImpl.java

@@ -1 +1 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47 +47 @@
 import gnu.java.rmi.server.UnicastServerRef;
 
+import java.util.Hashtable;
+
+/**
+  * I let DGCImpl to extend UnicastServerRef, but not 
+  * UnicastRemoteObject, because UnicastRemoteObject must
+  * exportObject automatically.
+  */
 public class DGCImpl
-        extends UnicastRemoteObject implements DGC {
+    extends UnicastServerRef implements DGC {
+
+    private static final long LEASE_VALUE = 600000L;
+    // leaseCache caches a LeaseRecord associated with a vmid
+    private Hashtable leaseCache = new Hashtable();
 
 public DGCImpl() throws RemoteException {
-        super(new UnicastServerRef(new ObjID(ObjID.DGC_ID), 0, RMISocketFactory.getSocketFactory()));
+        super(new ObjID(ObjID.DGC_ID), 0, RMISocketFactory.getSocketFactory());
 }
 
 public Lease dirty(ObjID[] ids, long sequenceNum, Lease lease) throws RemoteException {
-        System.out.println("DGCImpl.dirty - not implemented");
+        VMID vmid = lease.getVMID();
+        if (vmid == null)
+            vmid = new VMID();
+        long leaseValue = LEASE_VALUE;
+        //long leaseValue = lease.getValue();
+    lease = new Lease(vmid, leaseValue);
+        synchronized(leaseCache){
+            LeaseRecord lr = (LeaseRecord)leaseCache.get(vmid);
+            if (lr != null)
+                lr.reset(leaseValue);
+            else{
+                lr = new LeaseRecord(vmid, leaseValue);
+                leaseCache.put(vmid, lr);
+            }
+        }
+        
         return (lease);
 }
 
 public void clean(ObjID[] ids, long sequenceNum, VMID vmid, boolean strong) throws RemoteException {
-        System.out.println("DGCImpl.clean - not implemented");
+  // Not implemented
 }
+    
+  /**
+   * LeaseRecord associates a vmid to expireTime.
+   */
+  private static class LeaseRecord{
+    private VMID vmid;
+    private long expireTime;
+    
+    LeaseRecord(VMID vmid, long leaseValue){
+      this.vmid = vmid;
+      reset(leaseValue);
+    }
+    
+    // reset expireTime
+    void reset(long leaseValue){
+      long l = System.currentTimeMillis();
+      expireTime = l + leaseValue;
+    }
 
-}
+    boolean isExpired(){
+      long l = System.currentTimeMillis();
+      if ( l > expireTime)
+        return true;
+      return false;
+    }
+        
+  } //End of LeaseRecord
+
+} //End of DGCImpl

branches/GNU/src/gcc/libjava/gnu/java/rmi/dgc/DGCImpl_Skel.java

@@ +1 @@
+/* DGCImpl_Skel.java
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
 // Skel class generated by rmic - DO NOT EDIT!
 

branches/GNU/src/gcc/libjava/gnu/java/rmi/dgc/DGCImpl_Stub.java

@@ +1 @@
+/* DGCImpl_Stub.java
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
 // Stub class generated by rmic - DO NOT EDIT!
 

branches/GNU/src/gcc/libjava/gnu/java/rmi/registry/RegistryImpl.java

@@ -65 +65 @@
 public RegistryImpl(int port, RMIClientSocketFactory cf, RMIServerSocketFactory sf) throws RemoteException {
         super(new UnicastServerRef(new ObjID(ObjID.REGISTRY_ID), port, sf));
-        ((UnicastServerRef)getRef()).exportObject(this);
+        // The following is unnecessary, because UnicastRemoteObject export itself automatically.
+        //((UnicastServerRef)getRef()).exportObject(this);
 }
 

branches/GNU/src/gcc/libjava/gnu/java/rmi/registry/RegistryImpl_Skel.java

@@ +1 @@
+/* RegistryImpl_Skel.java
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
 // Skel class generated by rmic - DO NOT EDIT!
 

branches/GNU/src/gcc/libjava/gnu/java/rmi/registry/RegistryImpl_Stub.java

@@ +1 @@
+/* RegistryImpl_Stub.java
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
 // Stub class generated by rmic - DO NOT EDIT!
 
@@ -30 +68 @@
         try {
             java.rmi.server.RemoteRef.class.getMethod("invoke", new java.lang.Class[] { java.rmi.Remote.class, java.lang.reflect.Method.class, java.lang.Object[].class, long.class });
-            useNewInvoke = true;
+            useNewInvoke = false;
             $method_bind_0 = gnu.java.rmi.registry.RegistryImpl.class.getMethod("bind", new java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class});
             $method_list_1 = gnu.java.rmi.registry.RegistryImpl.class.getMethod("list", new java.lang.Class[] {});

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/RMIHashes.java

@@ -40 +40 @@
 import java.lang.reflect.Method;
 import java.lang.Class;
-import gnu.java.security.provider.SHA;
+import gnu.java.io.NullOutputStream;
+import gnu.java.lang.reflect.TypeSignature;
+import java.security.MessageDigest;
+import java.security.DigestOutputStream;
+import java.io.DataOutputStream;
+import java.io.ByteArrayOutputStream;
 
 public class RMIHashes
 {
+  //There're other places using DigestOutputStream to generate hash in classpath, but I think the way I used
+  //here is more efficient, anyway, you can switch to DigestOutputStream by doing like "//or:" comments say.
+  
+  //or:add this statement: private static final NullOutputStream nullOutputStream = new NullOutputStream ();
   public static long getMethodHash(Method meth)
   {
-    return meth.hashCode ();
+    //Object Serialization Spec 8.3
+    try
+    {
+        MessageDigest md = MessageDigest.getInstance ("SHA");
+        //or:remove this statement: DigestOutputStream digest_out = new DigestOutputStream (nullOutputStream, md);
+        ByteArrayOutputStream digest_out = new ByteArrayOutputStream();
+        DataOutputStream data_out = new DataOutputStream (digest_out);
+        
+        StringBuffer sbuf = new StringBuffer();
+        sbuf.append(meth.getName());
+        sbuf.append('(');
+        Class params[] = meth.getParameterTypes();
+        for(int i = 0; i < params.length; i++)
+            sbuf.append(TypeSignature.getEncodingOfClass(params[i]));
+        sbuf.append(')');
+        Class rcls = meth.getReturnType();
+        if(rcls != Void.TYPE)
+            sbuf.append(TypeSignature.getEncodingOfClass(rcls));
+        else
+            sbuf.append('V');
+        
+        data_out.writeUTF (sbuf.toString());
+        data_out.flush();
+        data_out.close ();
+
+        md.update(digest_out.toByteArray()); //or:remove this statement
+        byte[] sha = md.digest ();
+        long result = 0;
+        int len = sha.length < 8 ? sha.length : 8;
+        for (int i=0; i < len; i++)
+            result += (long)(sha[i] & 0xFF) << (8 * i);
+        return result;
+    }catch(Exception _){
+        return -1L;
+        }
   }
 
@@ -54 +97 @@
   }
 }
+

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/RMIObjectInputStream.java

@@ -1 +1 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45 +45 @@
 import java.net.MalformedURLException;
 import java.rmi.server.RMIClassLoader;
+import java.lang.ClassNotFoundException;
+import java.lang.reflect.Proxy;
 
 public class RMIObjectInputStream
         extends ObjectInputStream {
 
-UnicastConnectionManager manager;
-
-public RMIObjectInputStream(InputStream strm, UnicastConnectionManager man) throws IOException {
+public RMIObjectInputStream(InputStream strm) throws IOException {
         super(strm);
-        manager = man;
         enableResolveObject(true);
 }
 
 protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
-//System.out.println("Resolving class: " + desc.getName());
-        String annotation = (String)readObject();
-        if (annotation == null) {
-                return (super.resolveClass(desc));
+        String annotation = (String)getAnnotation();
+        
+        try {
+                if(annotation == null)
+                    return (RMIClassLoader.loadClass(desc.getName()));
+                else
+                    return (RMIClassLoader.loadClass(annotation, desc.getName()));
         }
-        else {
-                try {
-                        return (RMIClassLoader.loadClass(new URL(annotation), desc.getName()));
-                }
-                catch (MalformedURLException _) {
-                        throw new ClassNotFoundException(desc.getName());
-                }
+        catch (MalformedURLException _) {
+                throw new ClassNotFoundException(desc.getName());
         }
 }
 
+//Separate it for override by MarshalledObject
+protected Object getAnnotation()
+            throws IOException, ClassNotFoundException
+{
+    return readObject();
 }
+        
+protected Class resolveProxyClass(String intfs[])
+        throws IOException, ClassNotFoundException
+{
+    String annotation = (String)getAnnotation();
+        
+    Class clss[] = new Class[intfs.length];
+    if(annotation == null)
+        clss[0] = RMIClassLoader.loadClass(intfs[0]);
+    else
+        clss[0] = RMIClassLoader.loadClass(annotation, intfs[0]);
+    
+    //assume all interfaces can be loaded by the same classloader
+    ClassLoader loader = clss[0].getClassLoader();
+    for (int i = 0; i < intfs.length; i++)
+        clss[i] = Class.forName(intfs[i], false, loader);
+        
+    try {
+    return Proxy.getProxyClass(loader, clss);
+        } catch (IllegalArgumentException e) {
+            throw new ClassNotFoundException(null, e);
+        }  
+}
+
+protected Object readValue(Class valueClass) throws IOException, ClassNotFoundException {
+    if(valueClass.isPrimitive()){
+        if(valueClass == Boolean.TYPE)
+            return new Boolean(readBoolean());
+        if(valueClass == Byte.TYPE)
+            return new Byte(readByte());
+        if(valueClass == Character.TYPE)
+            return new Character(readChar());
+        if(valueClass == Short.TYPE)
+            return new Short(readShort());
+        if(valueClass == Integer.TYPE)
+            return new Integer(readInt());
+        if(valueClass == Long.TYPE)
+            return new Long(readLong());
+        if(valueClass == Float.TYPE)
+            return new Float(readFloat());
+        if(valueClass == Double.TYPE)
+            return new Double(readDouble());
+        else
+            throw new Error("Unsupported primitive class: " + valueClass);
+    } else
+        return readObject();
+}
+
+}

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java

@@ -1 +1 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42 +42 @@
 import java.io.IOException;
 import java.rmi.server.RMIClassLoader;
+import java.rmi.Remote;
+import java.rmi.server.RemoteStub;
+import java.rmi.server.ObjID;
 
 public class RMIObjectOutputStream
@@ -48 +51 @@
 public RMIObjectOutputStream(OutputStream strm) throws IOException {
         super(strm);
+        enableReplaceObject(true);
+}
+
+//Separate it for override by MarshalledObject
+protected void setAnnotation(String annotation) throws IOException{
+    writeObject(annotation);
 }
 
 protected void annotateClass(Class cls) throws IOException {
-//System.out.println("Annotating class: " + cls);
-        writeObject(RMIClassLoader.getClassAnnotation(cls));
+        setAnnotation(RMIClassLoader.getClassAnnotation(cls));
+}
+
+protected void annotateProxyClass(Class cls)
+        throws IOException
+{
+    annotateClass(cls);
+}
+    
+protected Object replaceObject(Object obj)
+        throws IOException
+{
+    if((obj instanceof Remote) && !(obj instanceof RemoteStub)){
+            UnicastServerRef ref = UnicastServer.getExportedRef((Remote)obj);
+            if (ref != null)
+                    return ref.getStub();
+    }
+    return obj;
+}
+
+protected void writeValue(Object value, Class valueClass) throws IOException{
+    if(valueClass.isPrimitive()){
+        if(valueClass == Boolean.TYPE)
+            writeBoolean(((Boolean)value).booleanValue());
+        else
+        if(valueClass == Byte.TYPE)
+            writeByte(((Byte)value).byteValue());
+        else
+        if(valueClass == Character.TYPE)
+            writeChar(((Character)value).charValue());
+        else
+        if(valueClass == Short.TYPE)
+            writeShort(((Short)value).shortValue());
+        else
+        if(valueClass == Integer.TYPE)
+            writeInt(((Integer)value).intValue());
+        else
+        if(valueClass == Long.TYPE)
+            writeLong(((Long)value).longValue());
+        else
+        if(valueClass == Float.TYPE)
+            writeFloat(((Float)value).floatValue());
+        else
+        if(valueClass == Double.TYPE)
+            writeDouble(((Double)value).doubleValue());
+        else
+            throw new Error("Unsupported primitive class: " + valueClass);
+    } else
+        writeObject(value);
 }
 

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/UnicastConnection.java

@@ -1 +1 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45 +45 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
@@ -60 +62 @@
 ObjectOutputStream oout;
 
+// reviveTime and expireTime make UnicastConnection pool-able
+long reviveTime = 0;
+long expireTime = Long.MAX_VALUE;
+
 UnicastConnection(UnicastConnectionManager man, Socket sock) {
         this.manager = man;
@@ -66 +72 @@
 
 void acceptConnection() throws IOException {
-//System.out.println("Accepting connection on " + lport);
-        din = new DataInputStream(sock.getInputStream());
-        dout = new DataOutputStream(sock.getOutputStream());
+//System.out.println("Accepting connection on " + sock);
+    //Use BufferedXXXStream would be more efficient
+        din = new DataInputStream(new BufferedInputStream(sock.getInputStream()));
+        dout = new DataOutputStream(new BufferedOutputStream(sock.getOutputStream()));
 
         int sig = din.readInt();
@@ -86 +93 @@
                 dout.writeUTF(manager.serverName);
                 dout.writeInt(manager.serverPort);
+                dout.flush();
 
                 // Read their hostname and port
@@ -95 +103 @@
 
 void makeConnection(int protocol) throws IOException {
-        dout = new DataOutputStream(sock.getOutputStream());
-        din = new DataInputStream(sock.getInputStream());
+    //Use BufferedXXXStream would be more efficient
+        din = new DataInputStream(new BufferedInputStream(sock.getInputStream()));
+        dout = new DataOutputStream(new BufferedOutputStream(sock.getOutputStream()));
 
         // Send header
@@ -102 +111 @@
         dout.writeShort(PROTOCOL_VERSION);
         dout.writeByte(protocol);
-        dout.flush();
-
+    dout.flush();
+    
         if (protocol != SINGLE_OP_PROTOCOL) {
                 // Get back ack.
@@ -118 +127 @@
                 dout.writeUTF(manager.serverName);
                 dout.writeInt(manager.serverPort);
+                dout.flush();
         }
         // Okay, ready to roll ...
@@ -132 +142 @@
 ObjectInputStream getObjectInputStream() throws IOException {
         if (oin == null) {
-                oin = new RMIObjectInputStream(din, manager);
+        oin = new RMIObjectInputStream(din);
         }
         return (oin);
@@ -145 +155 @@
 
 void disconnect() {
+        try {
+            if(oout != null)
+                oout.close();
+        sock.close();
+        }
+        catch (IOException _) {
+    }
+
         oin = null;
-        oout = null;
-        try {
-                sock.close();
-        }
-        catch (IOException _) {
-        }
+    oout = null;
         din = null;
         dout = null;
         sock = null;
+}
+
+public static final long CONNECTION_TIMEOUT = 10000L;
+
+static boolean isExpired(UnicastConnection conn, long l){
+    if (l <= conn.expireTime )
+        return false;
+    return true;
+}
+
+static void resetTime(UnicastConnection conn){
+    long l = System.currentTimeMillis();
+    conn.reviveTime = l;
+    conn.expireTime = l + CONNECTION_TIMEOUT;
 }
 
@@ -161 +188 @@
  */
 public void run() {
+    do{
         try {
                 UnicastServer.dispatch(this);
+            //don't discardConnection explicitly, only when
+            //  exception happens or the connection's expireTime 
+            //  comes
+        } catch (Exception e ){
                 manager.discardConnection(this);
-        }
-        catch (Exception e) {
-                e.printStackTrace();
-        }
-}
-
-}
+            break;
+        }
+    }while(true);
+}
+
+}

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/UnicastConnectionManager.java

@@ -1 +1 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42 +42 @@
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.RemoteException;
-import gnu.java.rmi.server.UnicastConnection;
-import java.util.Hashtable;
-import java.net.Socket;
-import java.net.ServerSocket;
 import java.io.IOException;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
+import java.io.DataInputStream;
 import java.lang.Thread;
 import java.lang.Runnable;
 import java.net.InetAddress;
+import java.net.Socket;
+import java.net.ServerSocket;
 import java.net.UnknownHostException;
+
+import java.util.ArrayList;
+import java.util.ConcurrentModificationException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import gnu.java.rmi.server.UnicastConnection;
 
 public class UnicastConnectionManager
@@ -58 +65 @@
 
 private static String localhost;
+// use different maps for server/client type UnicastConnectionManager
 private static Hashtable servers = new Hashtable();
-
-private Thread serverThread;
+private static Hashtable clients = new Hashtable();
+private ArrayList connections; //client connection pool
+
+// make serverThread volatile for poll
+private volatile Thread serverThread;
 private ServerSocket ssock;
 String serverName;
 int serverPort;
+
+static private Thread scavenger;
+
+// If client and server are in the same VM, serverobj represents server
+Object serverobj;
+
+private static RMISocketFactory defaultSocketFactory = RMISocketFactory.getSocketFactory();
 private RMIServerSocketFactory serverFactory;
 private RMIClientSocketFactory clientFactory;
 
+// The following is for debug
+private static int ncsock = 0;    //count of client socket
+private static int nssock = 0;    //count of server socket
+private static int ncmanager = 0; //count of client manager
+private static int nsmanager = 0; //count of server manager
+
+private static final boolean debug = false;
+
+private static final Object GLOBAL_LOCK = new Object();
+
 static {
         try {
-                localhost = InetAddress.getLocalHost().getHostName();
+                //Use host address instead of host name to avoid name resolving issues
+                //localhost = InetAddress.getLocalHost().getHostName();
+                localhost = InetAddress.getLocalHost().getHostAddress();
         }
         catch (UnknownHostException _) {
                 localhost = "localhost";
         }
-}
-
+        
+        
+}
+
+//Only one scavenger thread running globally
+private static void startScavenger(){
+    scavenger = new Thread(new Runnable(){
+        public void run(){
+            if (debug) System.out.println("************* start scavenger.");
+            boolean liveon = true;
+            while (liveon){
+                // Sleep for the expire timeout
+                try{
+                    Thread.sleep(UnicastConnection.CONNECTION_TIMEOUT);
+                }catch(InterruptedException _ie){
+                    break;
+                }
+                liveon = false;
+                // Scavenge all clients' connections that're expired
+                Iterator iter = clients.values().iterator();
+                long l = System.currentTimeMillis();
+                try{
+                    while(iter.hasNext()){
+                        UnicastConnectionManager man = (UnicastConnectionManager)iter.next();
+                        ArrayList conns = man.connections;
+                        synchronized(conns) { // is the lock a little coarser?
+                            for (int last = conns.size() - 1;
+                                 last >= 0;
+                                 --last)
+                            {
+                                UnicastConnection conn = (UnicastConnection)conns.get(last);
+                                if (UnicastConnection.isExpired(conn, l)){
+                                    conns.remove(last);
+                                    conn.disconnect();
+                                    conn = null;   
+                                }else
+                                    liveon = true; //there're still live connections
+                            }
+                        }
+                    }
+                }catch(ConcurrentModificationException cme) {
+                    // handle it lazily
+                    liveon = true;
+                }
+            }
+            scavenger = null;
+            if (debug) System.out.println("************* exit scavenger.");
+        }
+    });
+    scavenger.start();
+}
+
+/**
+  * Client UnicastConnectionManager constructor
+  */
 private UnicastConnectionManager(String host, int port, RMIClientSocketFactory csf) {
         ssock = null;
@@ -82 +165 @@
         serverFactory = null;
         clientFactory = csf;
-}
-
+    connections = new ArrayList();
+}
+
+/**
+  * Server UnicastConnectionManager constructor
+  */
 private UnicastConnectionManager(int port, RMIServerSocketFactory ssf) {
         try {
@@ -111 +198 @@
 //System.out.println("getInstance: " + host + "," + port + "," + csf);
         if (csf == null) {
-                csf = RMISocketFactory.getSocketFactory();
-        }
+        csf = defaultSocketFactory;
+        }
+        // change host name to host address to avoid name resolving issues
+        try{
+        host = InetAddress.getByName(host).getHostAddress();
+    }catch(Exception _){}
+    
         TripleKey key = new TripleKey(host, port, csf);
-        UnicastConnectionManager man = (UnicastConnectionManager)servers.get(key);
+        UnicastConnectionManager man = (UnicastConnectionManager)clients.get(key);
         if (man == null) {
                 man = new UnicastConnectionManager(host, port, csf);
-                servers.put(key, man);
+        if (debug) {
+            ncmanager++;
+            System.out.println("\n\n ====== " + ncmanager + " client managers.\n\n");
+        }
+                clients.put(key, man);
+        
+        // Detect if client and server are in the same VM, i.e., their keys are equal
+        UnicastConnectionManager svrman = (UnicastConnectionManager)servers.get(key);
+        if(svrman != null){ // server and client are in the same VM
+            man.serverobj = svrman.serverobj;
+        }
         }
         return (man);
@@ -129 +231 @@
 //System.out.println("getInstance: " + port + "," + ssf);
         if (ssf == null) {
-                ssf = RMISocketFactory.getSocketFactory();
+        ssf = defaultSocketFactory;
         }
         TripleKey key = new TripleKey(localhost, port, ssf);
@@ -135 +237 @@
         if (man == null) {
                 man = new UnicastConnectionManager(port, ssf);
+        if (debug) {
+            nsmanager++;
+            System.out.println("\n\n ****** " + nsmanager + " server managers.\n\n");
+        }
                 // The provided port might not be the set port.
                 key.port = man.serverPort;
@@ -159 +265 @@
 private UnicastConnection getServerConnection() throws IOException {
         Socket sock = ssock.accept();
+    sock.setTcpNoDelay(true); //??
         UnicastConnection conn = new UnicastConnection(this, sock);
         conn.acceptConnection();
-//System.out.println("Server connection " + conn);
+    if (debug){
+        nssock++;
+        System.out.println("\n\n ****** " + nssock + " server socks.\n\n");
+    }
+    //System.out.println("Server connection " + sock);
         return (conn);
 }
@@ -169 +280 @@
  */
 private UnicastConnection getClientConnection() throws IOException {
+    ArrayList conns = connections;
+    UnicastConnection conn;
+    
+    synchronized(conns) {
+        int nconn = conns.size() - 1;
+    
+        // if there're free connections in connection pool
+        if(nconn >= 0) {
+            conn = (UnicastConnection)conns.get(nconn);
+            //Should we check if conn is alive using Ping??
+            conns.remove(nconn);
+            
+            // Check if the connection is already expired
+            long l = System.currentTimeMillis();
+            if (!UnicastConnection.isExpired(conn, l)){
+                return conn;
+            }else {
+                conn.disconnect();
+                conn = null;   
+            }
+        }
+    }
+    
         Socket sock = clientFactory.createSocket(serverName, serverPort);
-        UnicastConnection conn = new UnicastConnection(this, sock);
+    conn = new UnicastConnection(this, sock);
         conn.makeConnection(DEFAULT_PROTOCOL);
-//System.out.println("Client connection " + conn);
+    
+    if (debug) {
+        ncsock++;
+        System.out.println("\n\n ====== " + ncsock + " client socks.\n\n");
+    }
+
         return (conn);
 }
@@ -182 +321 @@
 public void discardConnection(UnicastConnection conn) {
 //System.out.println("Discarding connection " + conn);
+    //conn.disconnect();
+    if (ssock != null) //server connection
         conn.disconnect();
+    else {
+        // To client connection, we'd like to return back to pool
+        UnicastConnection.resetTime(conn);
+        //Ensure there're only one scavenger globally
+        synchronized(GLOBAL_LOCK) {
+            connections.add(conn); //borrow this lock to garantee thread safety 
+            if (scavenger == null)
+                startScavenger();
+        }
+    }
 }
 
@@ -195 +346 @@
                 }
                 serverThread = new Thread(this);
+        // The following is not necessary when java.lang.Thread's constructor do this.
+        // serverThread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
         }
         serverThread.start();
@@ -200 +353 @@
 
 /**
+ * Stop a server on this manager
+ */
+public void stopServer() {
+    synchronized(this) {
+        if(serverThread != null){
+            serverThread = null;
+            try{
+                ssock.close();
+            }catch(Exception _){}
+        }
+    }
+}
+
+/**
  * Server thread for connection manager.
  */
 public void run() {
-        for (;;) {
+        for (;serverThread != null;) { // if serverThread==null, then exit thread
                 try {
 //System.out.println("Waiting for connection on " + serverPort);
                         UnicastConnection conn = getServerConnection();
-                        (new Thread(conn)).start();
+                        // use a thread pool to improve performance
+            //ConnectionRunnerPool.dispatchConnection(conn);
+            (new Thread(conn)).start();
                 }
                 catch (Exception e) {
-                        e.printStackTrace();
+            e.printStackTrace();
                 }
         }
@@ -229 +398 @@
         String host = in.readUTF();
         int port = in.readInt();
-        RMIClientSocketFactory csf = ((RMIObjectInputStream)in).manager.clientFactory;
-        return (getInstance(host, port, csf));
+        //RMIClientSocketFactory csf = ((RMIObjectInputStream)in).manager.clientFactory;
+        //return (getInstance(host, port, csf));
+        return (getInstance(host, port, null));
 }
 
@@ -263 +433 @@
                 if (this.host.equals(other.host) &&
                     this.other == other.other &&
-                    (this.port == other.port || this.port == 0 || other.port == 0)) {
+            (this.port == other.port /* || this.port == 0 || other.port == 0*/)) {
                         return (true);
                 }

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/UnicastRef.java

@@ -1 +1 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -63 +63 @@
 import java.io.DataOutputStream;
 
+import java.lang.reflect.InvocationTargetException;
+
 public class UnicastRef
         implements RemoteRef, ProtocolConstants {
@@ -70 +72 @@
 
 /**
- * Used by serialization.
- */
-private UnicastRef() {
+ * Used by serialization, and let subclass capable of having default constructor
+ */
+//private 
+UnicastRef() {
 }
 
@@ -85 +88 @@
 
 public Object invoke(Remote obj, Method method, Object[] params, long opnum) throws Exception {
+    // Check if client and server are in the same VM, then local call can be used to
+    // replace remote call, but it's somewhat violating remote semantic.
+    Object svrobj = manager.serverobj;
+    if(svrobj != null){
+        //local call
+                Object ret = null;
+                try{
+                    ret = method.invoke(svrobj, params);
+                }catch(InvocationTargetException e){
+                    throw (Exception)e.getTargetException();
+                }
+                //System.out.println("\n\n ***** local call: " + method + "\nreturn: " + ret + "\n\n");
+                return ret;
+        }
+        //System.out.println("***************** remote call:" + manager.serverPort);
         return (invokeCommon(obj, method, params, -1, opnum));
 }
@@ -108 +126 @@
                 out.writeInt(opnum);
                 out.writeLong(hash);
-                if (params != null) {
-                        for (int i = 0; i < params.length; i++) {
-                                if (params[i] instanceof UnicastRemoteObject) {
-                                        out.writeObject(UnicastRemoteObject.exportObject((UnicastRemoteObject)params[i]));
-                                }
-                                else {
-                                        out.writeObject(params[i]);
-                                }
-                        }
-                }
+                
+                // must handle primitive class and their wrapper classes
+                Class clss[] = method.getParameterTypes();
+            for(int i = 0; i < clss.length; i++)
+                ((RMIObjectOutputStream)out).writeValue(params[i], clss[i]);
 
                 out.flush();
@@ -132 +145 @@
         try {
                 din = conn.getDataInputStream();
-                if (din.readUnsignedByte() != MESSAGE_CALL_ACK) {
-                        throw new RemoteException("Call not acked");
+                
+                if ((returncode = din.readUnsignedByte()) != MESSAGE_CALL_ACK) {
+                    conn.disconnect();
+                        throw new RemoteException("Call not acked:" + returncode);
                 }
 
                 in = conn.getObjectInputStream();
-
                 returncode = in.readUnsignedByte();
                 ack = UID.read(in);
-                returnval = in.readObject();
+
+                Class cls = method.getReturnType();
+        if(cls == Void.TYPE){
+            returnval = null;
+            in.readObject();
+        }else
+            returnval = ((RMIObjectInputStream)in).readValue(cls);
+
         }
         catch (IOException e3) {
+            //for debug: e3.printStackTrace();
                 throw new RemoteException("call return failed: ", e3);
         }
 
+    /* if DGCAck is necessary??
+    //According to RMI wire protocol, send a DGCAck 
+    // to indicate receiving return value
+    dout.writeByte(MESSAGE_DGCACK);
+    ack.write(dout);
+    out.flush();
+    */
+    
         manager.discardConnection(conn);
 
-        if (returncode != RETURN_ACK) {
+        if (returncode != RETURN_ACK && returnval != null) {
                 throw (Exception)returnval;
         }
@@ -159 +189 @@
  */
 public RemoteCall newCall(RemoteObject obj, Operation[] op, int opnum, long hash) throws RemoteException {
-        return (new UnicastRemoteCall(obj, opnum, hash));
+    UnicastConnection conn;
+    
+        try {
+                conn = manager.getConnection();
+        }
+        catch (IOException e1) {
+                throw new RemoteException("connection failed to host: " + manager.serverName, e1);
+        }
+
+    //obj: useless?
+
+        return (new UnicastRemoteCall(conn, objid, opnum, hash));
 }
 
@@ -167 +208 @@
 public void invoke(RemoteCall call) throws Exception {
         UnicastRemoteCall c = (UnicastRemoteCall)call;
-        Object ret = invokeCommon((Remote)c.getObject(), (Method)null, c.getArguments(), c.getOpnum(), c.getHash());
-        c.setReturnValue(ret);
+        call.executeCall();
 }
 
@@ -175 +215 @@
  */
 public void done(RemoteCall call) throws RemoteException {
-        /* Does nothing */
+        UnicastRemoteCall c = (UnicastRemoteCall)call;
+        try{
+            c.done();
+        } catch(IOException e){}
+    UnicastConnection conn = c.getConnection();
+        manager.discardConnection(conn);
 }
 
@@ -184 +229 @@
         manager.write(out);
         objid.write(out);
-        out.writeByte(RETURN_ACK);
+        // This byte is somewhat confusing when interoperating with JDK
+        out.writeByte(0); //RETURN_ACK);
 }
 
@@ -190 +236 @@
         manager = UnicastConnectionManager.read(in);
         objid = ObjID.read(in);
-        if (in.readByte() != RETURN_ACK) {
+        byte ack = in.readByte();
+        // This byte is somewhat confusing when interoperating with JDK
+        if (ack != RETURN_ACK && ack != 0/*jdk ack value*/) {
                 throw new IOException("no ack found");
         }

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/UnicastRemoteCall.java

@@ -39 +39 @@
 
 import java.lang.Exception;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutput;
@@ -44 +46 @@
 import java.io.StreamCorruptedException;
 import java.rmi.server.RemoteCall;
+import java.rmi.RemoteException;
+import java.rmi.MarshalException;
+import java.rmi.UnmarshalException;
+import java.rmi.server.UID;
+import java.rmi.server.ObjID;
+import java.rmi.server.RemoteObject;
+
 import java.util.Vector;
 
-public class UnicastRemoteCall implements RemoteCall
+public class UnicastRemoteCall
+        implements RemoteCall, ProtocolConstants
 {
 
@@ -57 +67 @@
   private int ptr;
 
+  private ObjectOutput oout;
+  private ObjectInput oin;
+
   /**
    * Incoming call.
@@ -68 +81 @@
    * Outgoing call.
    */
-  UnicastRemoteCall(Object obj, int opnum, long hash)
-  {
-    this.object = obj;
+  UnicastRemoteCall(UnicastConnection conn, ObjID objid, int opnum, long hash)
+    throws RemoteException
+  {
+    this.conn = conn;
     this.opnum = opnum;
     this.hash = hash;
-  }
-
+    
+    // signal the call when constructing
+    try
+      {
+        DataOutputStream dout = conn.getDataOutputStream();
+        dout.write(MESSAGE_CALL);
+        
+        oout = conn.getObjectOutputStream();
+        objid.write(oout);
+        oout.writeInt(opnum);
+        oout.writeLong(hash);
+      }
+    catch(IOException ex)
+      {
+        throw new MarshalException("Try to write header but failed.", ex);
+      }
+  }
+  
+  UnicastConnection getConnection()
+  {
+    return conn;
+  }
+  
   public ObjectOutput getOutputStream() throws IOException
+  {
+    if (conn != null)
+      {
+        if(oout == null)
+          return (oout = conn.getObjectOutputStream());
+        else
+          return oout;
+      }
+    else
+      {
+        vec = new Vector();
+        return (new DummyObjectOutputStream());
+      }
+  }
+
+  public void releaseOutputStream() throws IOException
+  {
+    if(oout != null)
+      oout.flush();
+  }
+
+  public ObjectInput getInputStream() throws IOException
+  {
+    if (conn != null)
+      {
+        if(oin == null)
+          return (oin = conn.getObjectInputStream());
+        else
+          return oin;
+      }
+    else
+      {
+        ptr = 0;
+        return (new DummyObjectInputStream());
+      }
+  }
+
+  public void releaseInputStream() throws IOException
+  {
+    // Does nothing.
+  }
+
+  public ObjectOutput getResultStream(boolean success)
+    throws IOException, StreamCorruptedException
   {
     vec = new Vector();
     return new DummyObjectOutputStream();
   }
-
-  public void releaseOutputStream() throws IOException
-  {
-    // Does nothing.
-  }
-
-  public ObjectInput getInputStream() throws IOException
-  {
-    if (conn != null)
-      return conn.getObjectInputStream();
-    ptr = 0;
-    return new DummyObjectInputStream();
-  }
-
-  public void releaseInputStream() throws IOException
-  {
-    // Does nothing.
-  }
-
-  public ObjectOutput getResultStream(boolean success)
-    throws IOException, StreamCorruptedException
-  {
-    vec = new Vector();
-    return new DummyObjectOutputStream();
-  }
-
+  
   public void executeCall() throws Exception
   {
-    throw new Error("Not implemented");
+    byte returncode;
+    ObjectInput oin;
+    try
+      {
+        releaseOutputStream();
+        DataInputStream din = conn.getDataInputStream();
+        if (din.readByte() != MESSAGE_CALL_ACK)
+            throw new RemoteException("Call not acked");
+
+        oin = getInputStream();
+        returncode = oin.readByte();
+        UID.read(oin);
+      }
+    catch(IOException ex)
+      {
+        throw new UnmarshalException("Try to read header but failed:", ex);
+      }
+    
+    //check return code
+    switch(returncode)
+      {
+      case RETURN_ACK: //it's ok
+        return;
+      case RETURN_NACK:
+        Object returnobj;
+        try
+          {
+            returnobj = oin.readObject();
+          }
+        catch(Exception ex2)
+          {
+            throw new UnmarshalException
+              ("Try to read exception object but failed", ex2);
+          }
+        
+        if(!(returnobj instanceof Exception))
+          throw new UnmarshalException("Should be Exception type here: "
+                                       + returnobj);
+        throw (Exception)returnobj;
+        
+      default:
+        throw new UnmarshalException("Invalid return code");
+      }
   }
 
   public void done() throws IOException
   {
-    /* Does nothing */
+    // conn.disconnect();
   }
 
   Object returnValue()
   {
-    return vec.elementAt(0);
+    return (vec.size() > 0 ? vec.elementAt(0) : null);
   }
 

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/UnicastServer.java

@@ -1 +1 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46 +46 @@
 import java.util.Hashtable;
 import java.net.UnknownHostException;
+import java.rmi.Remote;
 import java.rmi.server.ObjID;
 import java.rmi.server.UnicastRemoteObject;
@@ -57 +58 @@
         implements ProtocolConstants {
 
-static private Hashtable objects = new Hashtable();
+static private Hashtable objects = new Hashtable();  //mapping OBJID to server ref
+static private Hashtable refcache = new Hashtable(); //mapping obj itself to server ref
 static private DGCImpl dgc;
 
@@ -63 +65 @@
         startDGC();
         objects.put(obj.objid, obj);
+        refcache.put(obj.myself, obj);
         obj.manager.startServer();
+}
+
+// FIX ME: I haven't handle force parameter
+public static boolean unexportObject(UnicastServerRef obj, boolean force) {
+        objects.remove(obj.objid);
+        refcache.remove(obj.myself);
+        obj.manager.stopServer();
+        return true;
+}
+
+public static UnicastServerRef getExportedRef(Remote remote){
+    return (UnicastServerRef)refcache.get(remote);
 }
 
@@ -70 +85 @@
                 try {
                         dgc = new DGCImpl();
-                        ((UnicastServerRef)dgc.getRef()).exportObject(dgc);
+                        // Changed DGCImpl to inherit UnicastServerRef directly
+                        //((UnicastServerRef)dgc.getRef()).exportObject(dgc);
+                        dgc.exportObject(dgc);
                 }
                 catch (RemoteException e) {
@@ -101 +118 @@
         Object returnval;
         int returncode = RETURN_ACK;
+        // returnval is from Method.invoke(), so we must check the return class to see
+        // if it's primitive type
+        Class returncls = null;
         if (uref != null) {
                 try {
                         // Dispatch the call to it.
                         returnval = uref.incomingMessageCall(conn, method, hash);
+                        returncls = uref.getMethodReturnType(method, hash);
                 }
                 catch (Exception e) {
@@ -122 +143 @@
         out.writeByte(returncode);
         (new UID()).write(out);
-        out.writeObject(returnval);
+        if(returnval != null && returncls != null)
+            ((RMIObjectOutputStream)out).writeValue(returnval, returncls);
+        else
+            out.writeObject(returnval);
 
         out.flush();

branches/GNU/src/gcc/libjava/gnu/java/rmi/server/UnicastServerRef.java

@@ -1 +1 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64 +64 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.Hashtable;
 
 public class UnicastServerRef
-        extends UnicastRef {
+        extends UnicastRef 
+        implements ServerRef{ //SHOULD implement ServerRef
 
 final static private Class[] stubprototype = new Class[] { RemoteRef.class };
 
-Remote myself;
+Remote myself; //save the remote object itself
 private Skeleton skel;
 private RemoteStub stub;
-private Hashtable methods;
+private Hashtable methods = new Hashtable();
+
+/**
+ * Used by serialization.
+ */
+UnicastServerRef()
+{
+}
 
 public UnicastServerRef(ObjID id, int port, RMIServerSocketFactory ssf) {
@@ -84 +94 @@
         if (myself == null) {
                 myself = obj;
+                // Save it to server manager, to let client calls in the same VM to issue
+                //  local call
+                manager.serverobj = obj;
 
                 // Find and install the stub
@@ -96 +109 @@
 
                 // Build hash of methods which may be called.
-                buildMethodHash(obj.getClass());
+                buildMethodHash(obj.getClass(), true);
 
                 // Export it.
@@ -105 +118 @@
 }
 
+public RemoteStub exportObject(Remote remote, Object obj)
+        throws RemoteException
+{
+    //FIX ME
+        return exportObject(remote);
+}
+
+public RemoteStub getStub(){
+    return stub;
+}
+
+
+public boolean unexportObject(Remote obj, boolean force) {
+    // Remove all hashes of methods which may be called.
+    buildMethodHash(obj.getClass(), false);
+    return UnicastServer.unexportObject(this, force);
+}
+
 private Object getHelperClass(Class cls, String type) {
         try {   
-                String classname = cls.getName();
-                Class scls = Class.forName(classname + type);
+            String classname = cls.getName();
+                ClassLoader cl = cls.getClassLoader(); //DONT use "Class scls = Class.forName(classname + type);"
+                Class scls = cl.loadClass(classname + type);
                 if (type.equals("_Stub")) {
                         try {
@@ -148 +180 @@
 }
 
-private void buildMethodHash(Class cls) {
-        methods = new Hashtable();
+private void buildMethodHash(Class cls, boolean build) {
         Method[] meths = cls.getMethods();
         for (int i = 0; i < meths.length; i++) {
@@ -157 +188 @@
                 }
                 long hash = RMIHashes.getMethodHash(meths[i]);
-                methods.put(new Long (hash), meths[i]);
+                if(build)
+                    methods.put(new Long (hash), meths[i]);
+                else
+                    methods.remove(new Long (hash));
 //System.out.println("meth = " + meths[i] + ", hash = " + hash);
         }
+}
+
+Class getMethodReturnType(int method, long hash) throws Exception
+{
+    if (method == -1) {
+        Method meth = (Method)methods.get(new Long (hash));
+        return meth.getReturnType();
+    }else
+        return null;
 }
 
@@ -190 +233 @@
                         }
                 }
-                return (meth.invoke(myself, args));
+                //We must reinterpret the exception thrown by meth.invoke()
+                //return (meth.invoke(myself, args));
+                Object ret = null;
+                try{
+                    ret = meth.invoke(myself, args);
+                }catch(InvocationTargetException e){
+                    throw (Exception)(e.getTargetException());
+                }
+                return ret;
         }
         // Otherwise this is JDK 1.1 style RMI - we find the skeleton

branches/GNU/src/gcc/libjava/gnu/java/security/provider/DefaultPolicy.java

@@ -1 +1 @@
 /* DefaultPolicy.java 
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48 +48 @@
 public class DefaultPolicy extends Policy
 {
-  static Permissions allPermissions = new Permissions();
-  
-  static
-  {
-    allPermissions.add(new AllPermission());
-  }
+  static Permission allPermission = new AllPermission();
 
   public PermissionCollection getPermissions(CodeSource codesource)
   {
-    return allPermissions;
+    Permissions perms = new Permissions();
+    perms.add(allPermission);
+    return perms;
   }
   

branches/GNU/src/gcc/libjava/gnu/java/security/provider/Gnu.java

@@ -1 +1 @@
 /* Gnu.java --- Gnu provider main class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46 +46 @@
     super( "GNU", 1.0, "GNU provider v1.0 implementing SHA-1, MD5, DSA");
 
+    // Note that all implementation class names are referenced by using
+    // Class.getName(). That way when we staticly link the Gnu provider
+    // we automatically get all the implementation classes.
+
     // Signature
-    put("Signature.SHA1withDSA", "gnu.java.security.provider.DSASignature");
+    put("Signature.SHA1withDSA",
+        gnu.java.security.provider.DSASignature.class.getName());
 
     put("Alg.Alias.Signature.DSS", "SHA1withDSA");
@@ -63 +68 @@
 
     // Key Pair Generator
-    put("KeyPairGenerator.DSA", "gnu.java.security.provider.DSAKeyPairGenerator");
+    put("KeyPairGenerator.DSA",
+        gnu.java.security.provider.DSAKeyPairGenerator.class.getName());
 
     put("Alg.Alias.KeyPairGenerator.OID.1.2.840.10040.4.1", "DSA");
@@ -70 +76 @@
 
     // Message Digests
-    put("MessageDigest.SHA", "gnu.java.security.provider.SHA");
-    put("MessageDigest.MD5", "gnu.java.security.provider.MD5");
+    put("MessageDigest.SHA", gnu.java.security.provider.SHA.class.getName());
+    put("MessageDigest.MD5", gnu.java.security.provider.MD5.class.getName());
 
     // Format "Alias", "Actual Name"
@@ -78 +84 @@
 
     // Algorithm Parameters
-    put("AlgorithmParameters.DSA", "gnu.java.security.provider.DSAAlgorithmParameters");
+    put("AlgorithmParameters.DSA",
+        gnu.java.security.provider.DSAParameters.class.getName());
 
     // Algorithm Parameter Generator
-    put("AlgorithmParameterGenerator.DSA", "gnu.java.security.provider.DSAAlgorithmParameterGenerator");
+    put("AlgorithmParameterGenerator.DSA",
+     gnu.java.security.provider.DSAParameterGenerator.class.getName());
 
     // SecureRandom
-    put("SecureRandom.SHA1PRNG", "gnu.java.security.provider.SHA1PRNG");
-
+    put("SecureRandom.SHA1PRNG",
+        gnu.java.security.provider.SHA1PRNG.class.getName());
 
   }

branches/GNU/src/gcc/libjava/gnu/java/security/provider/SHA.java

@@ -1 +1 @@
 /* SHA.java -- Class implementing the SHA-1 algorithm as specified in [1].
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -59 +59 @@
   public int engineGetDigestLength()
   {
-    return 16;
+    return 20;
   }
 
   public void engineUpdate (byte b)
   {
-    int i = (int)bytecount % 64;
-    int shift = (3 - i % 4) * 8;
+    int i = ((int)bytecount) & 0x3f; //wgs
+    int shift = (3 - i % 4) << 3;
     int idx = i / 4;
 
-    // if you could index ints, this would be: W[idx][shift/8] = b
-    W[idx] = (W[idx] & ~(0xff << shift)) | ((b & 0xff) << shift);
+    i = (int)b;
+    W[idx] = (W[idx] & ~(0xff << shift)) | ((i & 0xff) << shift);
 
     // if we've filled up a block, then process it
-    if ((++ bytecount) % 64 == 0)
+    if (((++bytecount) & 0x3f) == 0)
       munch ();
   }
@@ -100 +100 @@
   public byte[] engineDigest ()
   {
-    long bitcount = bytecount * 8;
+    long bitcount = bytecount << 3;
     engineUpdate ((byte)0x80); // 10000000 in binary; the start of the padding
 
     // add the rest of the padding to fill this block out, but leave 8
     // bytes to put in the original bytecount
-    while ((int)bytecount % 64 != 56)
+    while ((bytecount & 0x3f) != 56)
       engineUpdate ((byte)0);
 

branches/GNU/src/gcc/libjava/gnu/java/security/provider/SHA1PRNG.java

@@ -1 +1 @@
 /* SHA1PRNG.java --- Secure Random SPI SHA1PRNG
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -52 +52 @@
   int seedpos;
   int datapos;
+  private boolean seeded = false; // set to true when we seed this
 
   public SHA1PRNG()
@@ -58 +59 @@
       digest = MessageDigest.getInstance("SHA");
     } catch ( NoSuchAlgorithmException nsae) {
-      System.out.println("Failed to find SHA Message Digest: " + nsae);
-      nsae.printStackTrace();
+//      System.out.println("Failed to find SHA Message Digest: " + nsae);
+//      nsae.printStackTrace();
+      throw new InternalError ("no SHA implementation found");
     }
 
@@ -65 +67 @@
     seedpos = 0;
     data = new byte[40];
-    datapos = 0;
-
-    new Random().nextBytes(seed);
-
-    byte digestdata[];
-    digestdata = digest.digest( data );
-    System.arraycopy( digestdata, 0, data, 0, 20);
-
+    datapos = 20;  // try to force hashing a first block
   }
 
@@ -85 +80 @@
   public void engineNextBytes(byte[] bytes)
   {
+    ensureIsSeeded ();
     int loc = 0;
     while (loc < bytes.length)
@@ -114 +110 @@
     return tmp;
   }
+
+  private void ensureIsSeeded()
+  {
+    if (!seeded)
+      {
+        new Random(0L).nextBytes(seed);
+
+        byte[] digestdata = digest.digest(data);
+        System.arraycopy(digestdata, 0, data, 0, 20);
+
+        seeded = true;
+      }
+  }
+
 }

branches/GNU/src/gcc/libjava/gnu/java/text/SentenceBreakIterator.java

@@ -1 +1 @@
 /* SentenceBreakIterator.java - Default sentence BreakIterator.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -92 +92 @@
                    && Character.getType(n) == Character.END_PUNCTUATION)
               n = iter.next();
-            // Skip spaces.
-            while (n != CharacterIterator.DONE
-                   && Character.getType(n) == Character.SPACE_SEPARATOR)
-              n = iter.next();
-            // Skip optional paragraph separator.
-            if (n != CharacterIterator.DONE
-                && Character.getType(n) == Character.PARAGRAPH_SEPARATOR)
+            // Skip (java) space, line and paragraph separators.
+            while (n != CharacterIterator.DONE && Character.isWhitespace(n))
               n = iter.next();
 
@@ -112 +107 @@
                    && Character.getType(n) == Character.END_PUNCTUATION)
               n = iter.next();
-            // Skip spaces.  We keep count because we need at least
-            // one for this period to represent a terminator.
+            // Skip (java) space, line and paragraph separators.
+            // We keep count because we need at least one for this period to
+            // represent a terminator.
             int spcount = 0;
-            while (n != CharacterIterator.DONE
-                   && Character.getType(n) == Character.SPACE_SEPARATOR)
+            while (n != CharacterIterator.DONE && Character.isWhitespace(n))
               {
                 n = iter.next();
@@ -163 +158 @@
         if (! Character.isLowerCase(c)
             && (nt == Character.START_PUNCTUATION
-                || nt == Character.SPACE_SEPARATOR))
+                || Character.isWhitespace(n)))
           {
             int save = iter.getIndex();
@@ -174 +169 @@
             if (n == CharacterIterator.DONE)
               break;
-            if (Character.getType(n) == Character.SPACE_SEPARATOR)
-              {
-                // Must have at least once space after the `.'.
+            if (Character.isWhitespace(n))
+              {
+                // Must have at least one (java) space after the `.'.
                 int save2 = iter.getIndex();
                 while (n != CharacterIterator.DONE
-                       && Character.getType(n) == Character.SPACE_SEPARATOR)
+                       && Character.isWhitespace(n))
                   n = iter.previous();
                 // Skip close punctuation.
@@ -204 +199 @@
             break;
           }
-        else if (nt == Character.SPACE_SEPARATOR
+        else if (Character.isWhitespace(n)
                  || nt == Character.END_PUNCTUATION)
           {
             int save = iter.getIndex();
-            // Skip spaces.
-            while (n != CharacterIterator.DONE
-                   && Character.getType(n) == Character.SPACE_SEPARATOR)
+            // Skip (java) space, line and paragraph separators.
+            while (n != CharacterIterator.DONE
+                   && Character.isWhitespace(n))
               n = iter.previous();
             // Skip close punctuation.

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out