[Fix] allow reading of resolved linked to events where event is null

x-cubed · Jun 29, 2016 · acc4a1b · acc4a1b
1 parent 3f67317
commit acc4a1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;
 }