aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/System.java5
-rw-r--r--libjava/java/security/VMAccessController.java2
3 files changed, 5 insertions, 7 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 27061ae..9be7e4ac 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
2006-08-09 Gary Benson <gbenson@redhat.com>
+ * java/lang/System.java (setSecurityManager): Javadoc fix.
+ * java/security/VMAccessController.java (getContext): Comment fix.
+
+2006-08-09 Gary Benson <gbenson@redhat.com>
+
* include/java-stack.h (accesscontrol_trace_fn): Declare.
(GetAccessControlStack): Likewise.
(GetClassMethodStack): Remove.
diff --git a/libjava/java/lang/System.java b/libjava/java/lang/System.java
index 8ba0e89..6b125c9 100644
--- a/libjava/java/lang/System.java
+++ b/libjava/java/lang/System.java
@@ -167,11 +167,6 @@ public final class System
* first. Since this permission is denied by the default security manager,
* setting the security manager is often an irreversible action.
*
- * <STRONG>Spec Note:</STRONG> Don't ask me, I didn't write it. It looks
- * pretty vulnerable; whoever gets to the gate first gets to set the policy.
- * There is probably some way to set the original security manager as a
- * command line argument to the VM, but I don't know it.
- *
* @param sm the new SecurityManager
* @throws SecurityException if permission is denied
*/
diff --git a/libjava/java/security/VMAccessController.java b/libjava/java/security/VMAccessController.java
index c394753..04c90d2 100644
--- a/libjava/java/security/VMAccessController.java
+++ b/libjava/java/security/VMAccessController.java
@@ -159,8 +159,6 @@ final class VMAccessController
{
// If the VM is initializing return the all-permissive context
// so that any security checks succeed.
- //
- // XXX this might not be necessary, but it seems prudent.
if (Thread.currentThread() == null)
return DEFAULT_CONTEXT;