From acc4a1b5cbc1f29db1907fc22d6b2ed73217f4d3 Mon Sep 17 00:00:00 2001
From: Rob <rjmarshall@remotemetering.net>
Date: Wed, 29 Jun 2016 18:40:53 +0200
Subject: [PATCH] [Fix] allow reading of resolved linked to events where event
 is null

---
 ClientMessageDtos.proto | 2 +-
 lib/connection.js       | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ClientMessageDtos.proto b/ClientMessageDtos.proto
index ef98c5a..bc5a2c5 100644
--- a/ClientMessageDtos.proto
+++ b/ClientMessageDtos.proto
@@ -35,7 +35,7 @@ message EventRecord {
 }
 
 message ResolvedIndexedEvent {
-	required EventRecord event = 1;
+	optional EventRecord event = 1;
 	optional EventRecord link = 2;
 }
 
diff --git a/lib/connection.js b/lib/connection.js
index a5f7b36..80fa784 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -509,10 +509,12 @@ function unpackResolvedEvent(resolvedEvent) {
     if (!resolvedEvent) {
         return null;
     }
-    if (!resolvedEvent.event) {
-        throw new Error("Not a ResolvedEvent: " + resolvedEvent);
+
+    var unpackedEvent = {};
+    if (resolvedEvent.event) {
+        unpackedEvent = unpackEventRecord(resolvedEvent.event);
     }
-    var unpackedEvent = unpackEventRecord(resolvedEvent.event);
+
     if (resolvedEvent.link) unpackedEvent.link = unpackEventRecord(resolvedEvent.link);
     return unpackedEvent;
 }