Author: lindner
Date: Sat Oct 24 07:53:32 2009
New Revision: 829317
URL: http://svn.apache.org/viewvc?rev=829317&view=rev
Log:
SHINDIG-1209 | PersonImpl can construct malformed urls/photos lists
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java?rev=829317&r1=829316&r2=829317&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
Sat Oct 24 07:53:32 2009
@@ -634,7 +634,8 @@
if (url != null) {
url.setValue(profileUrl);
} else {
- setUrls(addListField(new UrlImpl(profileUrl, null, PROFILE_URL_TYPE),
getUrls()));
+ if (profileUrl != null)
+ setUrls(addListField(new UrlImpl(profileUrl, null, PROFILE_URL_TYPE),
getUrls()));
}
}
@@ -648,7 +649,8 @@
if (photo != null) {
photo.setValue(thumbnailUrl);
} else {
- setPhotos(addListField(new ListFieldImpl(THUMBNAIL_PHOTO_TYPE,
thumbnailUrl), getPhotos()));
+ if (thumbnailUrl != null)
+ setPhotos(addListField(new ListFieldImpl(THUMBNAIL_PHOTO_TYPE,
thumbnailUrl), getPhotos()));
}
}