Author: mfranklin
Date: Mon Feb 25 21:37:37 2013
New Revision: 1449909
URL: http://svn.apache.org/r1449909
Log:
Fixed ActivityStream target not detecting person object (RAVE-880)
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java?rev=1449909&r1=1449908&r2=1449909&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
Mon Feb 25 21:37:37 2013
@@ -411,12 +411,15 @@ public class DefaultActivityStreamsServi
private void populatePersonObjects(ActivityStreamsEntry entry, Map<String,
Person> peopleById) {
ActivityStreamsObject actor = entry.getActor();
- if(OBJECT_TYPE_PERSON.equals(actor.getObjectType())) {
+ if(entry.getActor() != null &&
OBJECT_TYPE_PERSON.equals(actor.getObjectType())) {
populatePerson(peopleById, actor);
}
- if(OBJECT_TYPE_PERSON.equals(entry.getObject().getObjectType())) {
+ if(entry.getObject() != null &&
OBJECT_TYPE_PERSON.equals(entry.getObject().getObjectType())) {
populatePerson(peopleById, entry.getObject());
}
+ if(entry.getTarget() != null &&
OBJECT_TYPE_PERSON.equals(entry.getTarget().getObjectType())) {
+ populatePerson(peopleById, entry.getTarget());
+ }
}
private void populatePerson(Map<String, Person> peopleById,
ActivityStreamsObject actor) {
