From 4c8f48931cad3a4b9507e812b447d9aaac73e67a Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Thu, 5 Feb 2015 16:28:59 +0100
Subject: [PATCH] Clear 'potential null pointer access' warnings.

---
 enabler/src/de/schildbach/pte/AbstractEfaProvider.java   | 5 +++++
 enabler/src/de/schildbach/pte/AbstractHafasProvider.java | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index 80ed041c..a8beffd1 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -17,6 +17,8 @@
 
 package de.schildbach.pte;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -2869,6 +2871,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 							}
 						}
 
+						checkState(departure != null);
+						checkState(arrival != null);
+
 						XmlPullUtil.skipExit(pp, "ps");
 
 						final boolean isRealtime = XmlPullUtil.valueTag(pp, "realtime").equals("1");
diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index 8dcd70eb..12ae6146 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -1201,10 +1201,10 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 					XmlPullUtil.skipExit(pp, "Arrival");
 
 					// remove last intermediate
-					final int size = intermediateStops != null ? intermediateStops.size() : 0;
-					if (size >= 1)
-						if (!intermediateStops.get(size - 1).location.id.equals(sectionArrivalLocation.id))
-							intermediateStops.remove(size - 1);
+					if (intermediateStops != null)
+						if (!intermediateStops.isEmpty())
+							if (!intermediateStops.get(intermediateStops.size() - 1).location.id.equals(sectionArrivalLocation.id))
+								intermediateStops.remove(intermediateStops.size() - 1);
 
 					XmlPullUtil.skipExit(pp, "ConSection");