Fix a handled exception thrown in the new TLM changeshappened logic

pull/14/head
Sam Bosley 13 years ago
parent 5d0b349114
commit abcfe11096

@ -49,29 +49,31 @@ public class TaskListMetadataChangesHappened extends ChangesHappened<TaskListMet
} }
if (pushedAt == 0 && !foundTagOrFilterId) { // Try to validate message if (pushedAt == 0 && !foundTagOrFilterId) { // Try to validate message
TaskListMetadata tlm = dao.fetch(uuid, TaskListMetadata.FILTER, TaskListMetadata.TAG_UUID); TaskListMetadata tlm = dao.fetch(id, TaskListMetadata.FILTER, TaskListMetadata.TAG_UUID);
String filterId = tlm.getValue(TaskListMetadata.FILTER); if (tlm != null) {
String tagUuid = tlm.getValue(TaskListMetadata.TAG_UUID); String filterId = tlm.getValue(TaskListMetadata.FILTER);
String tagUuid = tlm.getValue(TaskListMetadata.TAG_UUID);
TaskListMetadataOutstanding tlmo = new TaskListMetadataOutstanding(); TaskListMetadataOutstanding tlmo = new TaskListMetadataOutstanding();
boolean validChange = false; boolean validChange = false;
if (!TextUtils.isEmpty(filterId)) { if (!TextUtils.isEmpty(filterId)) {
validChange = true; validChange = true;
tlmo.setValue(TaskListMetadataOutstanding.ENTITY_ID_PROPERTY, id); tlmo.setValue(TaskListMetadataOutstanding.ENTITY_ID_PROPERTY, id);
tlmo.setValue(TaskListMetadataOutstanding.COLUMN_STRING, TaskListMetadata.FILTER.name); tlmo.setValue(TaskListMetadataOutstanding.COLUMN_STRING, TaskListMetadata.FILTER.name);
tlmo.setValue(TaskListMetadataOutstanding.VALUE_STRING, filterId); tlmo.setValue(TaskListMetadataOutstanding.VALUE_STRING, filterId);
tlmo.setValue(TaskListMetadataOutstanding.CREATED_AT, 0L); tlmo.setValue(TaskListMetadataOutstanding.CREATED_AT, 0L);
} else if (!RemoteModel.isUuidEmpty(tagUuid)) { } else if (!RemoteModel.isUuidEmpty(tagUuid)) {
validChange = true; validChange = true;
tlmo.setValue(TaskListMetadataOutstanding.ENTITY_ID_PROPERTY, id); tlmo.setValue(TaskListMetadataOutstanding.ENTITY_ID_PROPERTY, id);
tlmo.setValue(TaskListMetadataOutstanding.COLUMN_STRING, TaskListMetadata.TAG_UUID.name); tlmo.setValue(TaskListMetadataOutstanding.COLUMN_STRING, TaskListMetadata.TAG_UUID.name);
tlmo.setValue(TaskListMetadataOutstanding.VALUE_STRING, tagUuid); tlmo.setValue(TaskListMetadataOutstanding.VALUE_STRING, tagUuid);
tlmo.setValue(TaskListMetadataOutstanding.CREATED_AT, 0L); tlmo.setValue(TaskListMetadataOutstanding.CREATED_AT, 0L);
} }
if (validChange) { if (validChange) {
changes.add(tlmo); changes.add(tlmo);
}
} }
} }

Loading…
Cancel
Save