birkeh/api-themoviedb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent null pointer exception if trailers are null

Browse Source
This commit is contained in:
Stuart Boston
2014-01-16 12:27:44 +00:00
parent c0653861c0
commit 8c1aabf1d3
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTrailers.java
+12 -7
View File
@@ -54,7 +54,7 @@ public class WrapperTrailers extends AbstractWrapperId implements Serializable {
}
/**
* Get a combined list of the trailers with their source website
* Get a combined list of the trailers with their source
*
* @return
*/
@@ -62,14 +62,19 @@ public class WrapperTrailers extends AbstractWrapperId implements Serializable {
List<Trailer> trailers = new ArrayList<Trailer>();
// Add the trailer to the return list along with it's source
for (Trailer trailer : quicktime) {
trailer.setWebsite(Trailer.WEBSITE_QUICKTIME);
trailers.add(trailer);
if (quicktime != null) {
for (Trailer trailer : quicktime) {
trailer.setWebsite(Trailer.WEBSITE_QUICKTIME);
trailers.add(trailer);
}
}
// Add the trailer to the return list along with it's source
for (Trailer trailer : youtube) {
trailer.setWebsite(Trailer.WEBSITE_YOUTUBE);
trailers.add(trailer);
if (youtube != null) {
for (Trailer trailer : youtube) {
trailer.setWebsite(Trailer.WEBSITE_YOUTUBE);
trailers.add(trailer);
}
}
return trailers;