From 242c222c40d0cd25c7879f2c01ad0430e1a5cf36 Mon Sep 17 00:00:00 2001
From: "andreas.schildbach@gmail.com"
 <andreas.schildbach@gmail.com@0924bc21-9374-b0fa-ee44-9ff1593b38f0>
Date: Sun, 8 May 2011 21:34:25 +0000
Subject: [PATCH] fixed NPE if no product filter set

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@629 0924bc21-9374-b0fa-ee44-9ff1593b38f0
---
 src/de/schildbach/pte/BahnProvider.java | 99 +++++++++++++------------
 1 file changed, 51 insertions(+), 48 deletions(-)

diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index ae93ef00..fe3b6625 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -154,57 +154,60 @@ public final class BahnProvider extends AbstractHafasProvider
 		uri.append("&existProductNahverkehr=yes");
 		uri.append("&start=Suchen");
 
-		for (final char p : products.toCharArray())
+		if (products != null)
 		{
-			if (p == 'I')
+			for (final char p : products.toCharArray())
 			{
-				uri.append("&REQ0JourneyProduct_prod_section_0_0=1&REQ0JourneyProduct_prod_section_0_1=1");
-				if (via != null)
-					uri.append("&REQ0JourneyProduct_prod_section_1_0=1&REQ0JourneyProduct_prod_section_1_1=1");
+				if (p == 'I')
+				{
+					uri.append("&REQ0JourneyProduct_prod_section_0_0=1&REQ0JourneyProduct_prod_section_0_1=1");
+					if (via != null)
+						uri.append("&REQ0JourneyProduct_prod_section_1_0=1&REQ0JourneyProduct_prod_section_1_1=1");
+				}
+				if (p == 'R')
+				{
+					uri.append("&REQ0JourneyProduct_prod_section_0_2=1&REQ0JourneyProduct_prod_section_0_3=1");
+					if (via != null)
+						uri.append("&REQ0JourneyProduct_prod_section_1_2=1&REQ0JourneyProduct_prod_section_1_3=1");
+				}
+				if (p == 'S')
+				{
+					uri.append("&REQ0JourneyProduct_prod_section_0_4=1");
+					if (via != null)
+						uri.append("&REQ0JourneyProduct_prod_section_1_4=1");
+				}
+				if (p == 'U')
+				{
+					uri.append("&REQ0JourneyProduct_prod_section_0_7=1");
+					if (via != null)
+						uri.append("&REQ0JourneyProduct_prod_section_1_7=1");
+				}
+				if (p == 'T')
+				{
+					uri.append("&REQ0JourneyProduct_prod_section_0_8=1");
+					if (via != null)
+						uri.append("&REQ0JourneyProduct_prod_section_1_8=1");
+				}
+				if (p == 'B')
+				{
+					uri.append("&REQ0JourneyProduct_prod_section_0_5=1");
+					if (via != null)
+						uri.append("&REQ0JourneyProduct_prod_section_1_5=1");
+				}
+				if (p == 'P')
+				{
+					uri.append("&REQ0JourneyProduct_prod_section_0_9=1");
+					if (via != null)
+						uri.append("&REQ0JourneyProduct_prod_section_1_9=1");
+				}
+				if (p == 'F')
+				{
+					uri.append("&REQ0JourneyProduct_prod_section_0_6=1");
+					if (via != null)
+						uri.append("&REQ0JourneyProduct_prod_section_1_6=1");
+				}
+				// FIXME if (p == 'C')
 			}
-			if (p == 'R')
-			{
-				uri.append("&REQ0JourneyProduct_prod_section_0_2=1&REQ0JourneyProduct_prod_section_0_3=1");
-				if (via != null)
-					uri.append("&REQ0JourneyProduct_prod_section_1_2=1&REQ0JourneyProduct_prod_section_1_3=1");
-			}
-			if (p == 'S')
-			{
-				uri.append("&REQ0JourneyProduct_prod_section_0_4=1");
-				if (via != null)
-					uri.append("&REQ0JourneyProduct_prod_section_1_4=1");
-			}
-			if (p == 'U')
-			{
-				uri.append("&REQ0JourneyProduct_prod_section_0_7=1");
-				if (via != null)
-					uri.append("&REQ0JourneyProduct_prod_section_1_7=1");
-			}
-			if (p == 'T')
-			{
-				uri.append("&REQ0JourneyProduct_prod_section_0_8=1");
-				if (via != null)
-					uri.append("&REQ0JourneyProduct_prod_section_1_8=1");
-			}
-			if (p == 'B')
-			{
-				uri.append("&REQ0JourneyProduct_prod_section_0_5=1");
-				if (via != null)
-					uri.append("&REQ0JourneyProduct_prod_section_1_5=1");
-			}
-			if (p == 'P')
-			{
-				uri.append("&REQ0JourneyProduct_prod_section_0_9=1");
-				if (via != null)
-					uri.append("&REQ0JourneyProduct_prod_section_1_9=1");
-			}
-			if (p == 'F')
-			{
-				uri.append("&REQ0JourneyProduct_prod_section_0_6=1");
-				if (via != null)
-					uri.append("&REQ0JourneyProduct_prod_section_1_6=1");
-			}
-			// FIXME if (p == 'C')
 		}
 
 		return uri.toString();