From df9f6d515bd684e44082f76f1b721a12e95fb47f Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 16 Nov 2012 12:57:16 -0800 Subject: [PATCH] Fixed a null pointer exception that could get thrown in the subtasks metadata migration when bad data was in the database --- .../todoroo/astrid/subtasks/SubtasksMetadataMigration.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java index f68fcab8a..77422a963 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java @@ -101,8 +101,11 @@ public class SubtasksMetadataMigration { break; int indent = 0; - if (item.containsNonNullValue(SubtasksMetadata.INDENT)) - indent = item.getValue(SubtasksMetadata.INDENT); + if (item.containsNonNullValue(SubtasksMetadata.INDENT)) { + Integer i = item.getValue(SubtasksMetadata.INDENT); + if (i != null) + indent = i.intValue(); + } Node parent = findNextParentForIndent(root, indent); Node newNode = new Node(item.getValue(Metadata.TASK), parent, parent.indent + 1); parent.children.add(newNode);