KJ16609/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2026-02-23 04:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

System.java (setProperties): Only call init_properties() if properties is null.

Browse Source 
2000-11-24  Bryce McKinlay  <bryce@albatross.co.nz>

	* 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  <bryce@albatross.co.nz>

	* 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
This commit is contained in:
Bryce McKinlay
2000-11-26 01:48:04 +00:00
parent 3645c4dc1c
commit 213858c013
9 changed files with 370 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libjava/java/io/ObjectInputStream.java
View File

@@ -27,6 +27,8 @@ executable file might be covered by the GNU General Public License. */
package java.io;
import gnu.classpath.Configuration;
import java.lang.reflect.Array;
import java.lang.reflect.Modifier;
import java.util.Arrays;
@@ -61,6 +63,21 @@ public class ObjectInputStream extends InputStream
public ObjectInputStream (InputStream in)
throws IOException, StreamCorruptedException
{
if (Configuration.DEBUG)
{
String val = System.getProperty("gcj.dumpobjects");
if (dump == false && val != null && !val.equals(""))
{
dump = true;
System.out.println ("Serialization debugging enabled");
}
else if (dump == true && (val == null || val.equals("")))
{
dump = false;
System.out.println ("Serialization debugging disabled");
}
}
this.resolveEnabled = false;
this.isDeserializing = false;
this.blockDataPosition = 0;
@@ -1510,24 +1527,19 @@ public class ObjectInputStream extends InputStream
private boolean fieldsAlreadyRead;
private Vector validators;
private static boolean dump;
public native static void setDump (boolean dump);
private native void dumpElement (String msg);
private native void dumpElementln (String msg);
private static boolean dump;
/* FIXME: These 2 methods cause a build error on i686-pc-linux-gnu.
private void DEBUG (String msg)
private void dumpElement (String msg)
{
System.out.print (msg);
if (Configuration.DEBUG && dump)
System.out.print(msg);
}
private void DEBUGln (String msg)
private void dumpElementln (String msg)
{
System.out.println (msg);
if (Configuration.DEBUG && dump)
System.out.println(msg);
}
* end FIXME */
}