From 2dd7f99b0ab8447a8745fc5aa172b2105adf2fa1 Mon Sep 17 00:00:00 2001
From: wassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Date: Tue, 28 Jan 2003 19:56:25 +0000
Subject: [PATCH] Fixed bugs in ARP caching.  Site ARP was not being cached. 
 User ARP was being cached buy not always returned.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@430 ab3bd59b-922f-494d-bb5f-6f0a3c29deca
---
 .../middleware/shibboleth/aa/arp/AAPrincipal.java   |   17 +++++++++++++++++
 .../aa/arp/provider/BaseArpRepository.java          |   19 ++++++++++++++-----
 .../aa/arp/provider/FileSystemArpRepository.java    |    2 +-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/edu/internet2/middleware/shibboleth/aa/arp/AAPrincipal.java b/src/edu/internet2/middleware/shibboleth/aa/arp/AAPrincipal.java
index 031a2f9..c8bde2a 100755
--- a/src/edu/internet2/middleware/shibboleth/aa/arp/AAPrincipal.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/arp/AAPrincipal.java
@@ -77,4 +77,21 @@ public class AAPrincipal implements Principal {
 		return principalName;
 	}
 
+	/**
+	 * @see java.lang.Object#equals(Object)
+	 */
+	public boolean equals(Object obj) {
+		if (!(obj instanceof AAPrincipal)) {
+			return false;
+		}
+		return ((AAPrincipal) obj).getName().equals(getName());
+	}
+
+	/**
+	 * @see java.lang.Object#hashCode()
+	 */
+	public int hashCode() {
+		return "AAPrincipal".hashCode() + principalName.hashCode();
+	}
+
 }
diff --git a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/BaseArpRepository.java b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/BaseArpRepository.java
index f59bdfb..e081fa5 100755
--- a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/BaseArpRepository.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/BaseArpRepository.java
@@ -103,12 +103,15 @@ public abstract class BaseArpRepository implements ArpRepository {
 				+ principal.getName()
 				+ ").");
 		Set allPolicies = new HashSet();
-		if (getSitePolicy() != null) {
+		Arp sitePolicy = getSitePolicy();
+		if (sitePolicy != null) {
 			log.debug("Returning site policy.");
-			allPolicies.add(getSitePolicy());
+			allPolicies.add(sitePolicy);
 		}
-		if (getUserPolicy(principal) != null) {
-			allPolicies.add(getUserPolicy(principal));
+		
+		Arp userPolicy = getUserPolicy(principal);
+		if (userPolicy != null) {
+			allPolicies.add(userPolicy);
 			log.debug("Returning user policy.");
 		}
 		if (allPolicies.isEmpty()) {
@@ -273,6 +276,9 @@ class ArpCache {
 			return "ARP admin";
 		}
 
+		/**
+		 * @see java.lang.Object#equals(Object)
+		 */
 		public boolean equals(Object object) {
 			if (object instanceof SiteCachePrincipal) {
 				return true;
@@ -280,7 +286,10 @@ class ArpCache {
 			return false;
 		}
 
-		public long hashcode() {
+		/**
+		 * @see java.lang.Object#hashCode()
+		 */
+		public int hashCode() {
 			return "edu.internet2.middleware.shibboleth.aa.arp.provider.BaseArpRepository.SiteCachePrincipal"
 				.hashCode();
 		}
diff --git a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/FileSystemArpRepository.java b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/FileSystemArpRepository.java
index f82bcf6..67cd2ca 100755
--- a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/FileSystemArpRepository.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/FileSystemArpRepository.java
@@ -162,7 +162,7 @@ public class FileSystemArpRepository extends BaseArpRepository implements ArpRep
 				+ principal.getName()
 				+ ".xml";
 		log.debug(
-			"Attempting to load user (" + principal.getName() + ")ARP from: (" + fileName + ").");
+			"Attempting to load user (" + principal.getName() + ") ARP from: (" + fileName + ").");
 		return retrieveArpXml(fileName);
 	}
 
-- 
1.7.10.4