You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2010/08/12 21:13:26 UTC
svn commit: r984918 - in
/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util:
CertificateGrant.java ClassLoaderGrant.java CodeSourceGrant.java
PrincipalGrant.java ProtectionDomainGrant.java
Author: peter_firmstone
Date: Thu Aug 12 19:13:26 2010
New Revision: 984918
URL: http://svn.apache.org/viewvc?rev=984918&view=rev
Log:
Equals method optimisation as suggested by Fred Oliver
Modified:
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java
incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java?rev=984918&r1=984917&r2=984918&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CertificateGrant.java Thu Aug 12 19:13:26 2010
@@ -60,6 +60,7 @@ class CertificateGrant extends CodeSourc
public boolean equals(Object o){
if (o == null) return false;
if (o == this) return true;
+ if (o.hashCode() != this.hashCode()) return false;
if (o instanceof CertificateGrant){
CertificateGrant c = (CertificateGrant) o;
if ( !super.equals(o)) return false;
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java?rev=984918&r1=984917&r2=984918&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ClassLoaderGrant.java Thu Aug 12 19:13:26 2010
@@ -43,6 +43,7 @@ class ClassLoaderGrant extends Protectio
public boolean equals(Object o){
if (o == null) return false;
if (o == this) return true;
+ if (o.hashCode() != this.hashCode()) return false;
if (o instanceof ClassLoaderGrant && super.equals(o)){
return true;
}
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java?rev=984918&r1=984917&r2=984918&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/CodeSourceGrant.java Thu Aug 12 19:13:26 2010
@@ -55,6 +55,7 @@ class CodeSourceGrant extends PrincipalG
public boolean equals(Object o){
if (o == null) return false;
if (o == this) return true;
+ if (o.hashCode() != this.hashCode()) return false;
if (o instanceof CodeSourceGrant){
CodeSourceGrant c = (CodeSourceGrant) o;
if ( !super.equals(o)) return false;
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java?rev=984918&r1=984917&r2=984918&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/PrincipalGrant.java Thu Aug 12 19:13:26 2010
@@ -68,6 +68,7 @@ abstract class PrincipalGrant implements
public boolean equals(Object o){
if (o == null) return false;
if (o == this) return true;
+ if (o.hashCode() != this.hashCode()) return false;
if (o instanceof PrincipalGrant ){
PrincipalGrant p = (PrincipalGrant) o;
if (principals.equals(p.principals)
Modified: incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java?rev=984918&r1=984917&r2=984918&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/imp/security/policy/util/ProtectionDomainGrant.java Thu Aug 12 19:13:26 2010
@@ -58,6 +58,7 @@ class ProtectionDomainGrant extends Prin
public boolean equals(Object o){
if (o == null) return false;
if (o == this) return true;
+ if (o.hashCode() != this.hashCode()) return false;
if (o instanceof ProtectionDomainGrant){
ProtectionDomainGrant c = (ProtectionDomainGrant) o;
if ( !super.equals(o)) return false;