From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Mon, 12 Mar 2012 21:11:06 +0000 (+0100)
Subject: Fix some null pointer exceptions
X-Git-Tag: 0.2~5
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=4ea0f6b56076223a87815629fa77c06fa83ba297;p=tv_grab_nl_java

Fix some null pointer exceptions
---

diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java b/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java
index 5ada73c..6cf663d 100644
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java
@@ -20,7 +20,7 @@ public class ProgrammeDetails implements Serializable {
 		this.titel = org.apache.commons.lang.StringEscapeUtils.unescapeHtml(titel);
 		this.genre = org.apache.commons.lang.StringEscapeUtils.unescapeHtml(genre);
 		this.synop = org.apache.commons.lang.StringEscapeUtils.unescapeHtml(synop);
-		if (synop.isEmpty() && ( genre.toLowerCase().equals("movies") || genre.toLowerCase().equals("film"))) {
+		if ((synop == null || synop.isEmpty()) && ( genre == null || (!genre.toLowerCase().equals("movies") && !genre.toLowerCase().equals("film")))) {
 			//System.out.println("Splitting title: \"" + p.titel + "\"");
 			String[] parts = p.titel.split("[[:space:]]*:[[:space:]]*", 2);
 			if (parts.length >= 2 ) {
diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java b/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java
index e7424fb..271b149 100644
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java
@@ -102,19 +102,19 @@ public class XmlTvWriter {
 							//System.out.println("highlight_content: " + p.highlight_content);
 						}
 					}
-					if (!p.details.kijkwijzer.isEmpty() ||
-							!p.details.presentatie.isEmpty() || 
-							!p.details.presentatie.isEmpty() ||
-							!p.details.acteursnamen_rolverdeling.isEmpty()
+					if ((p.details.kijkwijzer != null && !p.details.kijkwijzer.isEmpty()) ||
+							(p.details.presentatie != null && !p.details.presentatie.isEmpty()) || 
+							(p.details.regisseur != null && !p.details.regisseur.isEmpty()) ||
+							(p.details.acteursnamen_rolverdeling != null && !p.details.acteursnamen_rolverdeling.isEmpty())
 							) {
 						writer.writeStartElement("credits");
-						if (!p.details.kijkwijzer.isEmpty()) {
+						if (p.details.kijkwijzer != null && !p.details.kijkwijzer.isEmpty()) {
 							writer.writeStartElement("rating");
 							writer.writeAttribute("system", "kijkwijzer");
 							writer.writeCharacters(p.details.kijkwijzer);
 							writer.writeEndElement();
 						}
-						if (!p.details.presentatie.isEmpty()) {
+						if (p.details.presentatie != null && !p.details.presentatie.isEmpty()) {
 							String[] parts = p.details.presentatie.split(",");
 							for (String s: parts) {
 								writer.writeStartElement("presenter");
@@ -122,7 +122,7 @@ public class XmlTvWriter {
 								writer.writeEndElement();
 							}
 						}
-						if (!p.details.regisseur.isEmpty()) {
+						if (p.details.regisseur != null && !p.details.regisseur.isEmpty()) {
 							String[] parts = p.details.regisseur.split(",");
 							for (String s: parts) {
 								writer.writeStartElement("director");
@@ -130,7 +130,7 @@ public class XmlTvWriter {
 								writer.writeEndElement();
 							}
 						}
-						if (!p.details.acteursnamen_rolverdeling.isEmpty()) {
+						if (p.details.acteursnamen_rolverdeling != null && !p.details.acteursnamen_rolverdeling.isEmpty()) {
 							String[] parts = p.details.acteursnamen_rolverdeling.split(",");
 							for (String s: parts) {
 								writer.writeStartElement("actor");