summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2004-06-03 13:21:19 +0000
committerMichael Koch <konqueror@gmx.de>2004-06-03 13:21:19 +0000
commit220039296ca11b9ceee9a62a883ec258743e5ef3 (patch)
tree234ac2a2d2dda2024ec5cdbe2dac485f6bf7e65b
parent4e450e3b7e2a0e95162a2c0c02d564796a89bea2 (diff)
downloadclasspath-220039296ca11b9ceee9a62a883ec258743e5ef3.tar.gz
2004-06-03 Michael Koch <konqueror@gmx.de>
* java/security/AccessControlContext.java (equals): Renamed protectionDomain to protectionDomains. (hashCode): Likewise. * vm/reference/java/security/.cvsignore: New file.
-rw-r--r--ChangeLog7
-rw-r--r--java/security/AccessControlContext.java6
-rw-r--r--vm/reference/java/security/.cvsignore2
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f932ec07e..ec7a0fe80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-03 Michael Koch <konqueror@gmx.de>
+
+ * java/security/AccessControlContext.java
+ (equals): Renamed protectionDomain to protectionDomains.
+ (hashCode): Likewise.
+ * vm/reference/java/security/.cvsignore: New file.
+
2004-06-03 Casey Marshall <csm@gnu.org>
* java/security/AccessController.java
diff --git a/java/security/AccessControlContext.java b/java/security/AccessControlContext.java
index c986ab279..45d1410a7 100644
--- a/java/security/AccessControlContext.java
+++ b/java/security/AccessControlContext.java
@@ -139,7 +139,7 @@ public final class AccessControlContext
{
AccessControlContext acc = (AccessControlContext) obj;
- if (acc.protectionDomain.length != protectionDomain.length)
+ if (acc.protectionDomains.length != protectionDomains.length)
return false;
int i, j;
@@ -166,8 +166,8 @@ public final class AccessControlContext
public int hashCode()
{
int h = 0;
- for (int i = 0; i < protectionDomain.length; i++)
- h ^= protectionDomain[i].hashCode();
+ for (int i = 0; i < protectionDomains.length; i++)
+ h ^= protectionDomains[i].hashCode();
return h;
}
diff --git a/vm/reference/java/security/.cvsignore b/vm/reference/java/security/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/vm/reference/java/security/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in