Author: lindner
Date: Thu Mar 20 14:51:33 2008
New Revision: 639475
URL: http://svn.apache.org/viewvc?rev=639475&view=rev
Log:
avoid NPE when ID is not in the full list
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java?rev=639475&r1=639474&r2=639475&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
Thu Mar 20 14:51:33 2008
@@ -48,13 +48,15 @@
List<Person> people = new ArrayList<Person>();
for (String id : ids) {
Person person = allPeople.get(id);
- if (id.equals(token.getViewerId())) {
- person.setIsViewer(true);
+ if (person != null) {
+ if (id.equals(token.getViewerId())) {
+ person.setIsViewer(true);
+ }
+ if (id.equals(token.getOwnerId())) {
+ person.setIsOwner(true);
+ }
+ people.add(person);
}
- if (id.equals(token.getOwnerId())) {
- person.setIsOwner(true);
- }
- people.add(person);
}
// We can pretend that by default the people are in top friends order
