litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 9428 from 1.4 maint branch

Browse source
This commit is contained in:
j2blake 2011-12-15 20:43:15 +00:00
parent afafd90e13
commit f3d6e33a01
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
View file

@ -126,7 +126,9 @@ public class SelfEditingConfiguration {
/** /**
* Get all Individuals associated with this externalAuthId through the * 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, public List<Individual> getAssociatedIndividuals(IndividualDao indDao,
String externalAuthId) { String externalAuthId) {
@ -138,6 +140,10 @@ public class SelfEditingConfiguration {
log.debug("externalAuthId is null"); log.debug("externalAuthId is null");
return Collections.emptyList(); return Collections.emptyList();
} }
if (externalAuthId.isEmpty()) {
log.debug("externalAuthId is empty");
return Collections.emptyList();
}
if (selfEditingIdMatchingProperty == null) { if (selfEditingIdMatchingProperty == null) {
log.debug("selfEditingMatchingProperty is null"); log.debug("selfEditingMatchingProperty is null");
return Collections.emptyList(); return Collections.emptyList();