[kaffe] CVS kaffe (guilhem): Reverted a patch against GNU Classpath.
Kaffe CVS
cvs-commits at kaffe.org
Fri Jul 30 05:05:20 PDT 2004
PatchSet 5029
Date: 2004/07/30 11:52:25
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Reverted a patch against GNU Classpath.
* libraries/java/lang/Thread.java: Reverted to original file from
GNU Classpath.
* libraries/java/lang/Runtime.java
(addShutdownHook): Use getThreadGroup() == null instead of hasDied()
which has the same meaning.
Members:
ChangeLog:1.2587->1.2588
libraries/javalib/java/lang/Runtime.java:1.29->1.30
libraries/javalib/java/lang/Thread.java:1.48->1.49
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2587 kaffe/ChangeLog:1.2588
--- kaffe/ChangeLog:1.2587 Fri Jul 30 11:22:32 2004
+++ kaffe/ChangeLog Fri Jul 30 11:52:25 2004
@@ -1,3 +1,12 @@
+2004-07-30 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * libraries/java/lang/Thread.java: Reverted to original file from
+ GNU Classpath.
+
+ * libraries/java/lang/Runtime.java
+ (addShutdownHook): Use getThreadGroup() == null instead of hasDied()
+ which has the same meaning.
+
2004-07-30 Kiyo Inaba <inaba at src.ricoh.co.jp>
* kaffe/kaffevm/jit3/machine.c:
Index: kaffe/libraries/javalib/java/lang/Runtime.java
diff -u kaffe/libraries/javalib/java/lang/Runtime.java:1.29 kaffe/libraries/javalib/java/lang/Runtime.java:1.30
--- kaffe/libraries/javalib/java/lang/Runtime.java:1.29 Thu Jul 29 14:25:17 2004
+++ kaffe/libraries/javalib/java/lang/Runtime.java Fri Jul 30 11:52:27 2004
@@ -272,7 +272,7 @@
if (VMShuttingDown)
throw new IllegalStateException("VM is shutting down.");
}
- if (hook.isAlive() || hook.isInterrupted() || hook.hasDied())
+ if (hook.isAlive() || hook.isInterrupted() || hook.getThreadGroup() == null)
throw new IllegalArgumentException("Thread has already been started once.");
synchronized( shutdownHooks ) {
Index: kaffe/libraries/javalib/java/lang/Thread.java
diff -u kaffe/libraries/javalib/java/lang/Thread.java:1.48 kaffe/libraries/javalib/java/lang/Thread.java:1.49
--- kaffe/libraries/javalib/java/lang/Thread.java:1.48 Thu Jul 29 14:25:17 2004
+++ kaffe/libraries/javalib/java/lang/Thread.java Fri Jul 30 11:52:27 2004
@@ -130,9 +130,6 @@
/** The next thread number to use. */
private static int numAnonymousThreadsCreated;
- /** True if the thread has already been started */
- private boolean alreadyStarted;
-
/**
* Allocates a new <code>Thread</code> object. This constructor has
* the same effect as <code>Thread(null, null,</code>
@@ -971,14 +968,5 @@
{
group.removeThread(this);
vmThread = null;
- alreadyStarted = true;
- }
-
- /**
- * Returns true if the thread had already been started once.
- */
- final boolean hasDied()
- {
- return alreadyStarted;
}
}
More information about the kaffe
mailing list