From 663c96e7819b5680d620c53da58eef661de32791 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 26 Jun 2012 18:13:41 -0700
Subject: [PATCH] In GpxImporter, support cases when the content is null.

---
 .../android/apps/mytracks/io/file/GpxImporter.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxImporter.java
index 17dbfe9af..06f155df2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxImporter.java
@@ -410,6 +410,10 @@ public class GpxImporter extends DefaultHandler {
       return;
     }
 
+    if (content == null) {
+      return;
+    }
+      
     // Parse the time
     long time;
     try {
@@ -452,7 +456,7 @@ public class GpxImporter extends DefaultHandler {
    * On altitude element end.
    */
   private void onAltitudeElementEnd() throws SAXException {
-    if (location != null) {
+    if (location != null && content != null) {
       try {
         location.setAltitude(Double.parseDouble(content));
       } catch (NumberFormatException e) {
@@ -465,14 +469,18 @@ public class GpxImporter extends DefaultHandler {
    * On name element end.
    */
   private void onNameElementEnd() {
-    track.setName(content.toString().trim());
+    if (content != null) {
+      track.setName(content.toString().trim());
+    }
   }
 
   /**
    * On description element end.
    */
   private void onDescriptionElementEnd() {
-    track.setDescription(content.toString().trim());
+    if (content != null) {
+      track.setDescription(content.toString().trim());
+    }
   }
 
   /**