From f3d6e33a0185532ec7517fc530b03dd1e3041ff1 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 15 Dec 2011 20:43:15 +0000
Subject: [PATCH] Merge 9428 from 1.4 maint branch

---
 .../vitro/webapp/beans/SelfEditingConfiguration.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
index 6d21fc388..d69f3341e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
@@ -126,7 +126,9 @@ public class SelfEditingConfiguration {
 
 	/**
 	 * Get all Individuals associated with this externalAuthId through the
-	 * matching property. Never returns null.
+	 * matching property. If the externalAuthId is empty or null, it won't match
+	 * anything, even though many individuals might have empty matching
+	 * properties. Never returns null.
 	 */
 	public List<Individual> getAssociatedIndividuals(IndividualDao indDao,
 			String externalAuthId) {
@@ -138,6 +140,10 @@ public class SelfEditingConfiguration {
 			log.debug("externalAuthId is null");
 			return Collections.emptyList();
 		}
+		if (externalAuthId.isEmpty()) {
+			log.debug("externalAuthId is empty");
+			return Collections.emptyList();
+		}
 		if (selfEditingIdMatchingProperty == null) {
 			log.debug("selfEditingMatchingProperty is null");
 			return Collections.emptyList();