Commit Graph

1830 Commits

Author SHA1 Message Date
Krister Walfridsson
7deae97af8 configure.in: Disable hash sync when not using threads.
* configure.in: Disable hash sync when not using threads.
        * configure: Regenerated.

From-SVN: r58641
2002-10-29 23:03:17 +00:00
Tom Tromey
ca7c2b8529 natRuntime.cc (_Jv_SetDLLSearchPath): New function.
* java/lang/natRuntime.cc (_Jv_SetDLLSearchPath): New function.
	(_Jv_FindSymbolInExecutable): Removed argument name.
	(insertSystemProperties): Call _Jv_SetDLLSearchPath if
	java.library.path is set.

	* gij.cc (help): Document --showversion.
	(version): Don't exit.
	(main): Handle --showversion.  Exit if --version given.

From-SVN: r58520
2002-10-25 03:28:00 +00:00
Tom Tromey
f7d11ebda1 Primes.java: Removed.
* libjava.lang/Primes.java: Removed.
	* libjava.lang/Primes.out: Removed.

From-SVN: r58498
2002-10-24 17:45:23 +00:00
Tom Tromey
b0af98d793 jni.cc (_Jv_JNI_AllocObject): Removed old FIXME comment.
* jni.cc (_Jv_JNI_AllocObject): Removed old FIXME comment.
	(array_from_valist): Correctly handle promotion for jint, jlong,
	jfloat, and jdouble.

From-SVN: r58476
2002-10-23 23:19:55 +00:00
Tom Tromey
6ddbb7ebba For PR java/6388:
* libjava.lang/pr6388.java: New file.
	* libjava.lang/pr6388.out: New file.

From-SVN: r58475
2002-10-23 22:56:13 +00:00
Ranjit Mathew
963f08a97f natFileWin32.cc (attr): Use FindFirstFile( ) instead of GetFileAttributesEx( ) to find file length and...
2002-10-23  Ranjit Mathew <rmathew@hotmail.com>

        * java/io/natFileWin32.cc (attr): Use FindFirstFile( ) instead of
        GetFileAttributesEx( ) to find file length and modification times,
        as the latter is not present on Windows 95.

From-SVN: r58466
2002-10-23 20:44:24 +00:00
Michael Koch
a9fe07988c Fix date, grrr.
From-SVN: r58346
2002-10-21 05:04:07 +00:00
Michael Koch
e1caed8988 2002-10-11 Michael Koch <konqueror@gmx.de>
* java/net/URL.java
	(URL): Activate SecurityManager checks.
	(equals): Use URLStreamHandler implementation instead of doing it
	alone. This allows special protocol stream handlers to change default
	behaviour.
	(hashCode): Use URLStreamHandler implementation instead of doing it
	alone. This allows special protocol stream handlers to change default
	behaviour.
	* java/net/URLStreamHandler.java
	(equals): Implemented default URL equality check.
	(hostsEqual): Implemented default URL equality check.
	(hashCode): Implemented default URL hashCode algorithm.
	* java/net/natPlainDatagramSocketImpl.cc:
	No lines longer then 80 characters.

From-SVN: r58345
2002-10-21 04:53:50 +00:00
Adam Megacz
e2a450f6e8 aclocal.m4 (CHECK_FOR_BROKEN_MINGW_LD): added
2002-10-20  Adam Megacz <adam@xwt.org>

        * aclocal.m4 (CHECK_FOR_BROKEN_MINGW_LD): added
        * configure.in: enabled hash sync on Win32
        * include/win32-threads.h (_Jv_ThreadId_t): added.
        * java/lang/natObject.cc (_Jv_MonitorEnter, _Jv_MonitorExit,
        heavy_lock_obj_finalization_proc, wait, notify, notifyAll):
        removed some posix-isms, use Thread::sleep() instead of usleep,
        added code to clear bottom three bits if platform has a broken
        linker.  * include/win32-threads.h (_Jv_ThreadId_t): added.

From-SVN: r58344
2002-10-21 01:50:14 +00:00
Ranjit Mathew
6d0b22ecb0 natRuntime.cc (insertSystemProperties): Added GCJ runtime property "gnu.gcj.progname" containing the name used to...
2002-10-19  Ranjit Mathew <rmathew@hotmail.com>

	* java/lang/natRuntime.cc (insertSystemProperties): Added GCJ
	runtime property "gnu.gcj.progname" containing the name used to
	invoke the current Java program (similar to argv[0] for C
	programs).

From-SVN: r58343
2002-10-20 23:47:43 +00:00
Tom Tromey
315b65915c re PR libgcj/8234 (ZipInputStream chokes when InputStream.read() returns small chunks)
Fix for PR libgcj/8234:
	* java/util/zip/natInflater.cc (reset): Reset avail_in.
	* java/util/zip/natDeflater.cc (reset): Reset avail_in.

From-SVN: r58205
2002-10-16 14:58:15 +00:00
Andrew Haley
20a5fa3d0c cvs commit fubar.
From-SVN: r58178
2002-10-15 19:25:13 +00:00
Andrew Haley
de78b090db Fix bad checkin.
From-SVN: r58177
2002-10-15 19:00:24 +00:00
Andrew Haley
f95eae39f8 EvaluationOrder.java (EvaluationOrder): New.
2002-10-15  Andrew Haley  <aph@redhat.com>

        * libjava.lang/EvaluationOrder.java (EvaluationOrder): New.
        * libjava.lang/EvaluationOrder.out (EvaluationOrder): New.

From-SVN: r58176
2002-10-15 18:43:11 +00:00
Andrew Haley
006941eb2f StaticConstructor.java: New.
2002-10-14  Andrew Haley  <aph@redhat.com>

        * libjava.lang/StaticConstructor.java: New.
        * libjava.lang/StaticConstructor.out: New.

From-SVN: r58131
2002-10-14 19:02:56 +00:00
Mark Wielaard
8fa7c5af3f * mauve-libgcj: Enable Mauve tests that compile now.
From-SVN: r58100
2002-10-13 11:10:27 +00:00
Mark Wielaard
07fe984bc0 * libjava.mauve/xfails: Remove tests that now XPASS.
From-SVN: r58099
2002-10-13 11:07:24 +00:00
Mark Wielaard
9dac635528 re PR libgcj/8142 ('$' in class names vs. dlopen 'dynamic string tokens')
Fix for PR libgcj/8142
	* java/lang/natClassLoader.cc (findClass): Skip inner classes when
	loading native modules.

From-SVN: r58066
2002-10-11 22:10:37 +00:00
Michael Koch
9461e24c01 2002-10-10 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractListModel.java
	(getListDataListeners): New stubbed method.
	javax/swing/DefaultBoundedRangeModel.java
	(getChangeListeners): New stubbed method.
	javax/swing/DefaultSingleSelectionModel.java
	(getChangeListeners): New stubbed method.

From-SVN: r58011
2002-10-10 12:08:37 +00:00
Michael Koch
4d1d2b093d cvsignore: New file to ignore files generated during build.
2002-10-10  Michael Koch  <konqueror@gmx.de>

	* gcj/.cvsignore: New file to ignore files generated during build.
	* include/.cvsignore: New file to ignore files generated during build.

From-SVN: r58003
2002-10-10 05:21:53 +00:00
Michael Koch
7393decb70 2002-10-08 Michael Koch <konqueror@gmx.de>
* java/net/HttpURLConnection.java
	(getPermission): New method.
	(getErrorStream): New stub method.
	(getHeaderFieldDate): New stub method.
	* java/net/Inet4Address.java:
	(isLinkLocalAddress): Typo fixed.
	* java/net/InetAddress.java:
	(readResolve): New stubbed method (for serialization).
	(isAnyLocalAddress): New stubbed method.
	(isLoopbackAddress): New stubbed method.
	(isLinkLocalAddress): New stubbed method.
	(isSiteLocalAddress): New stubbed method.
	(isMCGlobal): New stubbed method.
	(isMCNodeGlobal): New stubbed method.
	(isMCLinkLocal): New stubbed method.
	(isMCSiteLocal): New stubbed method.
	(isMCOrgLocal): New stubbed method.
	(getCanonicalHostName): New stubbed method.
	(getByAddress): Create instances of Inet4Address/Inet6Address,
	instead of InetAddress, documentation added.
	* java/net/MulticastSocket.java
	(getInterface): Removed FIXME.
	(getNetworkInterface): New method.
	(setNetworkInterface): New method.
	* java/net/NetworkInterface.java:
	(toString): Use property "line.separator" instead of "\n".
	* java/net/URLConnection.java
	(getContent): New stubbed method.
	* java/net/URLStreamHandler.java:
	(equals): New stubbed method.
	(hostsEqual): New stubbed method.
	(hashCode): New stubbed method.
	* java/net/natNetworkInterface.cc:
	(getRealNetworkInterfaces): Create Inet4Address object
	instead of InetAddress.

From-SVN: r58002
2002-10-10 05:19:22 +00:00
Ulrich Weigand
b7932de6a1 interpret.cc (_Jv_InterpMethod::run): Use UINT32 instead of unsigned long temporary to implement insn_iushr shifts.
* interpret.cc (_Jv_InterpMethod::run): Use UINT32 instead of
	unsigned long temporary to implement insn_iushr shifts.

From-SVN: r57936
2002-10-08 18:12:42 +00:00
Ulrich Weigand
5404cddbc8 configure.host [s390*-*]: Enable Java interpreter.
* configure.host [s390*-*]: Enable Java interpreter.
	Enable hash synchronization.  Add sysdeps dir.
	* sysdep/s390/locks.h: New file.

From-SVN: r57927
2002-10-08 14:57:37 +00:00
Mark Wielaard
8086481ce6 Thread.java (setDaemon): Check startable_flag, not isAlive().
* java/lang/Thread.java (setDaemon): Check startable_flag,
	not isAlive().

From-SVN: r57906
2002-10-07 21:02:38 +00:00
Michael Koch
0c59cbfaf6 Buffer.java: New stub file.
2002-10-07  Michael Koch  <konqueror@gmx.de>

	* java/nio/Buffer.java: New stub file.
	* java/nio/charset/spi/CharsetProvider.java: Commented out all usages
	of class Charset.
	* Makefile.am (java_native_source_files): Added java/nio/Buffer.java.
	* Makefile.in: Regenerated.

From-SVN: r57901
2002-10-07 13:56:38 +00:00
Michael Koch
0f31d44168 ByteBuffer.java: removed import of not commited class.
2002-10-07  Michael Koch  <konqueror@gmx.de>

	* java/nio/ByteBuffer.java:
	removed import of not commited class.

From-SVN: r57900
2002-10-07 13:39:22 +00:00
Michael Koch
7f73f46f93 ByteBuffer.java, [...]: New files, forgot to add these dummies.
2002-10-07  Michael Koch  <konqueror@gmx.de>

	* java/nio/ByteBuffer.java,
	java/nio/MappedByteBuffer.java:
	New files, forgot to add these dummies.
	* Makefile.am (java_native_source_files): Added new files.
	* Makefile.in: Regenerated.

From-SVN: r57899
2002-10-07 13:12:42 +00:00
Michael Koch
0b6dfe3b83 AlreadyConnectedException.java, [...]: New file.
2002-10-07  Michael Koch  <konqueror@gmx.de>

	* java/nio/channels/AlreadyConnectedException.java,
	java/nio/channels/ClosedChannelException.java,
	java/nio/channels/ReadableByteChannel.java,
	java/nio/channels/InterruptibleChannel.java,
	java/nio/channels/Channel.java,
	java/nio/channels/ByteChannel.java,
	java/nio/channels/GatheringByteChannel.java,
	java/nio/channels/ScatteringByteChannel.java,
	java/nio/channels/WritableByteChannel.java,
	java/nio/charset/CharacterCodingException.java,
	java/nio/charset/IllegalCharsetNameException.java,
	java/nio/charset/MalformedInputException.java,
	java/nio/charset/UnmappableCharacterException.java,
	java/nio/charset/UnsupportedCharsetException.java,
	java/nio/charset/spi/CharsetProvider.java: New file.
	These files are exceptions or interfaces,
	no real or abstract classes.
	* Makefile.am (java_native_source_files): Added new files.
	* Makefile.in: Regenerated.

From-SVN: r57885
2002-10-07 07:59:12 +00:00
Michael Koch
f5b63cb6d7 2002-10-05 Michael Koch <konqueror@gmx.de>
* java/net/InetAddress.java
	(getByAddress): Fixed documentation.
	(getByAddress): New method.
	* java/net/Inet4Address.java: New file.
	* java/net/URL.java
	(URL): Documentation added.
	(getContent): Documentation added.
	(getContent): New stubbed method.
	(getQuery): New method.
	(openConnection): Documentation added.
	(openStream): Documentation added.
	(setURLStreamHandlerFactory): Documentation added.
	* java/net/URI.java: New stub file.
	* Makefile.am
	(java_native_source_files): Added java/net/Inet4Address.java,
	java/net/Inet6Address.java and java/net/URI.java.
	* Makefile.in: Regenerated.

From-SVN: r57841
2002-10-05 07:49:08 +00:00
Mark Wielaard
7992cddd91 [multiple changes]
2002-10-04  C. Scott Ananian <cananian@lesser-magoo.lcs.mit.edu>

	* java/lang/ProtectionDomain.java (linesep): Remove field.
	(toString): Use System.getProperty("line.separator").

2002-10-04  Michael Koch  <konqueror@gmx.de>

	* java/security/Identity.java: Added serialVersionUID.
	* java/security/KeyPair.java: Added serialVersionUID.
	* java/security/Provider.java: Added serialVersionUID.
	* java/security/SecureRandom.java: Added serialVersionUID.
	* java/security/SecureRandomSpi.java: Added serialVersionUID.
	* java/security/SignedObject.java: Added serialVersionUID.
	* java/security/cert/Certificate.java: Added serialVersionUID.

2002-10-04  Mark Wielaard <mark@klomp.org>

	* java/security/Security.java: Use java.home or gnu.classpath.home
	to load providers.
	(loadProviders): Extra dir argument.
	(getProvider): Return null when not found.

From-SVN: r57827
2002-10-04 20:17:26 +00:00
Mark Wielaard
0a3fbe88bb * java/lang/Throwable.java: Remerge with Classpath.
From-SVN: r57823
2002-10-04 16:47:36 +00:00
Michael Koch
cc40c1e130 2002-10-04 Michael Koch <konqueror@gmx.de>
* java/net/InetAddress.java:
	(isMulticastAddress): Added documentation.
	(getHostAddress): Added documentation.
	(toString): Added documentation.
	(getByAddress): Fixed documentation.
	(getByName): Added documentation.
	(getAllByName): Added documentation.
	(getLocalHost): Added documentation.

From-SVN: r57814
2002-10-04 08:49:26 +00:00
Michael Koch
9c826022f9 BeanContextChildSupport.java: Added serialVersionUID.
2002-10-04  Michael Koch  <konqueror@gmx.de>

	* java/beans/beancontext/BeanContextChildSupport.java:
	Added serialVersionUID.
	* java/text/Collator.java: (compare): Made documentation HTML-aware.
	* javax/naming/BinaryRefAddr.java: Added serialVersionUID.
	* javax/naming/Name.java: Added serialVersionUID.

From-SVN: r57813
2002-10-04 08:48:03 +00:00
Adam Megacz
e662e109a1 natNetworkInterface.cc (getRealNetworkInterfaces): ifdef out some functionality that isn't supported yet on WIN32.
2002-10-03  Adam Megacz <adam@xwt.org>

	    * natNetworkInterface.cc (getRealNetworkInterfaces): ifdef out
	    some functionality that isn't supported yet on WIN32.

From-SVN: r57794
2002-10-03 22:54:04 +00:00
Tom Tromey
3db03e43f9 Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
	* Makefile.am (awt_java_source_files): Added new files.

From-SVN: r57781
2002-10-03 18:22:40 +00:00
Michael Koch
8e3cce3234 InetAddress.java (class InetAddress): Removed final keyword.
2002-10-03  Michael Koch  <konqueror@gmx.de>

	* java/net/InetAddress.java
	(class InetAddress): Removed final keyword.
	(equals): Fixed typo.
	(getByAddress): New method.

From-SVN: r57779
2002-10-03 17:17:39 +00:00
Michael Koch
e37383993d Autoscroll.java: New file, merge from Classpath.
2002-10-03  Michael Koch  <konqueror@gmx.de>

	* java/awt/dnd/Autoscroll.java:
	New file, merge from Classpath.
	* java/awt/dnd/DragSourceAdapter.java:
	(dragExit): Fixed typos in argument type.
	(dragDropEnd): Fixed typos in argument type.
	* java/awt/dnd/DragSourceDropEvent.java:
	New file, merge from Classpath.
	* java/awt/dnd/DropTarget.java:
	Added stubs, merge from Classpath.
	* java/awt/dnd/DropTargetAdapter.java:
	New file, merge from Classpath.
	* java/awt/dnd/DropTargetContext.java:
	New file, merge from Classpath.
	* java/awt/dnd/DropTargetDragEvent.java:
	New file, merge from Classpath.
	* java/awt/dnd/DropTargetDropEvent.java:
	New file, merge from Classpath.
	* java/awt/dnd/DropTargetEvent.java:
	New file, merge from Classpath.
	* java/awt/dnd/DropTargetListener.java:
	New file, merge from Classpath.
	* java/awt/dnd/MouseDragGestureRecognizer.java:
	New file, merge from Classpath.
	* java/awt/dnd/peer/DropTargetContextPeer.java:
	New file, merge from Classpath.

From-SVN: r57777
2002-10-03 14:40:43 +00:00
Michael Koch
a8e8f5c359 2002-10-03 Michael Koch <konqueror@gmx.de>
* java/net/DatagramPacket.java
	(setLength): Fixed typo and be HTML-aware.
	* java/net/InetSocketAddress.java
	(InetSocketAddress): Correct initialization of hostname, fixed typo.
	(equals): Added comment about equality of InetSocketAddress objects.
	* java/net/ServerSocket.java
	(accept): Added checks.
	(isClosed): New stubbed method.
	* java/net/SocketOptions.java: Reindention.
	* java/net/SocketPermission
	(SocketPermission): Documentation fixed.

From-SVN: r57776
2002-10-03 14:30:48 +00:00
Andrew Haley
cd8dbeeff3 Array_3.java (baz): New.
2002-10-03  Andrew Haley  <aph@redhat.com>

	* libjava.lang/Array_3.java (baz): New.
	(main): Call baz.

From-SVN: r57774
2002-10-03 13:12:01 +00:00
Michael Koch
e832ab3c91 2002-09-30 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java
	(receive): Check with SecurityManager AFTER the packet is received,
	check if connected to multicast address, documentation added.
	(send): Only check SecurityManager if connected, check address of
	packet to send.
	(connect): Implemented, documentation added.
	* java/net/Inet6Address.java: New file (not added yet to Makefile.am).
	* java/net/InetSocketAddress.java
	(whole file): Reindented.
	(hostname): New attribute.
	(InetSocketAddress): Initialize new attribute.
	(getAddress): Documentation added.
	(getHostName): Documentation added.
	(getPort): Documentation added.
	(hashCode): Documentation added.
	(isUnresolved): Documentation added.
	(toString): Conform to output of JDK 1.4.1, documentation added.
	* java/net/MulticastSocket.java
	(joinGroup): Removed FIXME, documentation added.
	(leaveGroup): Removed FIXME, documentation added.
	(send): Documentation added.
	* java/net/Socket.java
	(inputShutdown): New variable.
	(outputShutdown): New variable.
	(Socket): Initialize new variables.
	(getRemoteSocketAddress): Check if connected.
	(shutdownInput): Set new variable.
	(shutdownOutput): Set new variable.
	(isConnected): New method.
	(isClosed): New method.
	(isInputShutdown): New method.
	(isOutputShutdown): New method.
	* java/net/URLStreamHandler.java
	(URLStreamHandler): New method.
	(openConnection): Added documentation.
	(parseURL): Added documentation.
	(getHostAddress): New method.
	(getDefaultPort): New method.

From-SVN: r57772
2002-10-03 11:23:33 +00:00
Tom Tromey
593bbdc115 ActivationDesc.java, [...]: New versions from Classpath.
* java/rmi/activation/ActivationDesc.java,
	java/rmi/activation/ActivationGroupDesc.java,
	java/rmi/activation/ActivationGroupID.java,
	java/rmi/activation/ActivationID.java: New versions from
	Classpath.

From-SVN: r57752
2002-10-02 21:21:37 +00:00
Bo Thorsen
73bff06445 locks.h (compare_and_swap): Fix multilib support.
2002-09-30  Bo Thorsen  <bo@suse.de>

	* sysdep/x86-64/locks.h (compare_and_swap): Fix multilib support.

From-SVN: r57682
2002-10-01 11:02:08 +02:00
Tom Tromey
d74732f5cd ObjectInputStream.java (resolveProxyClass): New method from Classpath.
* java/io/ObjectInputStream.java (resolveProxyClass): New method
	from Classpath.
	* Makefile.in: Rebuilt.
	* Makefile.am (rmi_java_source_files): Added new files.
	* gnu/java/rmi/RMIMarshalledObjectInputStream.java,
	gnu/java/rmi/RMIMarshalledObjectOutputStream.java,
	gnu/java/rmi/server/ConnectionRunnerPool.java: New files from
	Classpath.
	* gnu/java/rmi/dgc/DGCImpl.java,
	gnu/java/rmi/dgc/DGCImpl_Skel.java,
	gnu/java/rmi/dgc/DGCImpl_Stub.java,
	gnu/java/rmi/registry/RegistryImpl_Skel.java,
	gnu/java/rmi/registry/RegistryImpl_Stub.java,
	gnu/java/rmi/server/RMIHashes.java,
	gnu/java/rmi/server/RMIObjectInputStream.java,
	gnu/java/rmi/server/RMIObjectOutputStream.java,
	gnu/java/rmi/server/UnicastConnection.java,
	gnu/java/rmi/server/UnicastConnectionManager.java,
	gnu/java/rmi/server/UnicastRef.java,
	gnu/java/rmi/server/UnicastServer.java,
	gnu/java/rmi/server/UnicastServerRef.java,
	java/rmi/MarshalledObject.java,
	java/rmi/server/RMIClassLoader.java,
	java/rmi/server/RemoteObject.java,
	java/rmi/server/UnicastRemoteObject.java,
	java/security/SecureClassLoader.java: Merged from Classpath.

From-SVN: r57675
2002-10-01 03:46:43 +00:00
Anthony Green
d3cc3f10da Add Proxy support.
From-SVN: r57635
2002-09-30 05:19:09 +00:00
Richard Earnshaw
841b836041 configure.host: Handle arm*-elf, strongarm*-elf and xscale*-elf with a single configuration.
* configure.host: Handle arm*-elf, strongarm*-elf and xscale*-elf with
a single configuration.

From-SVN: r57611
2002-09-28 12:15:18 +00:00
Jesse Rosenstock
8dc24041f7 re PR libgcj/7786 (TimeZone.getDSTSavings() from JDK1.4 not implemented)
2002-09-25  Jesse Rosenstock  <jmr@ugcs.caltech.edu>

	* java/util/TimeZone.java (getDSTSavings): New method.
	Fixes PR libgcj/7786.

From-SVN: r57518
2002-09-25 21:10:21 +00:00
Jesse Rosenstock
8848a766bc re PR libgcj/7709 (NullPointerException in _Jv_ResolvePoolEntry)
2002-09-25  Jesse Rosenstock  <jmr@ugcs.caltech.edu>

	* resolve.cc (_Jv_ResolvePoolEntry) [end_of_method_search]: Check
	to see if `the_method == 0' before looking up vtable index.
	Fixes PR libgcj/7709.

From-SVN: r57517
2002-09-25 21:02:32 +00:00
Tom Tromey
169f75f384 * java/lang/natClassLoader.cc:
(_Jv_PrepareCompiledClass): Throw NoClassDefFoundError, per spec.
	* resolve.cc: Include NoClassDefFoundError.h, not
	ClassNotFoundException.h.
	(_Jv_ResolvePoolEntry): Throw NoClassDefFoundError, per spec.
	* defineclass.cc: Don't include ClassNotFoundException.h.

From-SVN: r57516
2002-09-25 20:57:03 +00:00
Tom Tromey
fd44a92df6 resolve.cc: Include StringBuffer.
* resolve.cc: Include StringBuffer.
	(_Jv_ResolvePoolEntry): Use StringBuffer to create error string.

From-SVN: r57515
2002-09-25 20:40:09 +00:00
Tom Tromey
7ea082bbb5 boehm.cc (_Jv_MarkObj): Don't fail if class object has been allocated but not initialized.
* boehm.cc (_Jv_MarkObj): Don't fail if class object has been
	allocated but not initialized.

From-SVN: r57514
2002-09-25 20:14:37 +00:00