From 213858c013438c43989052d3f86fb93b2e9b274a Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sun, 26 Nov 2000 01:48:04 +0000 Subject: System.java (setProperties): Only call init_properties() if properties is null. 2000-11-24 Bryce McKinlay * java/lang/System.java (setProperties): Only call init_properties() if properties is null. (getProperties): Ditto. (getProperty): Ditto. (setProperty): Call init_properties if properties are null. (prop_init): Remove field. * java/lang/natSystem.cc (init_properties): Synchronize the entire method. Check for null properties after synchronizing instead of prop_init flag. Set the properties field last for thread safety. * java/io/ObjectInputStream.java (ObjectInputStream): If DEBUG is set, test for gcj.dumpobjects property and enable object stream dumping if it is set. (dumpElement): No longer native. (dumpElementln): Ditto. (setDump): Do not define. * java/io/natObjectInputStream.cc (dumpElement): Removed. (dumpElementln): Removed. (setDump): Removed. 2000-11-24 Bryce McKinlay * configure: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (built_java_source_files): Add Configuration.java. * configure.in: Add Configuration.java to CONFIG_FILES. Set LIBGCJDEBUG substitution if --enable-libgcj-debug is specified. Create `gnu' directory in the build tree. * gnu/classpath/Configuration.java.in: New file. From-SVN: r37749 --- libjava/java/io/natObjectInputStream.cc | 37 --------------------------------- 1 file changed, 37 deletions(-) (limited to 'libjava/java/io/natObjectInputStream.cc') diff --git a/libjava/java/io/natObjectInputStream.cc b/libjava/java/io/natObjectInputStream.cc index ac72ecf2b05..856f6e286e5 100644 --- a/libjava/java/io/natObjectInputStream.cc +++ b/libjava/java/io/natObjectInputStream.cc @@ -78,40 +78,3 @@ java::io::ObjectInputStream::getMethod (jclass klass, jstring name, { return klass->getPrivateMethod (name, arg_types); } - -#ifdef DEBUG -void -java::io::ObjectInputStream::setDump (jboolean dump) -{ - java::io::ObjectInputStream::dump = dump; -} - -void -java::io::ObjectInputStream::dumpElement (jstring msg) -{ - if (dump) - java::lang::System::out->print (msg); -} - -void -java::io::ObjectInputStream::dumpElementln (jstring msg) -{ - if (dump) - java::lang::System::out->println (msg); -} -#else -void -java::io::ObjectInputStream::setDump (jboolean dump) -{ -} - -void -java::io::ObjectInputStream::dumpElement (jstring msg) -{ -} - -void -java::io::ObjectInputStream::dumpElementln (jstring msg) -{ -} -#endif -- cgit v1.2.3