From 60b10296535def7fe3ac77bbb114c0e780643355 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 14 May 2015 22:22:22 +0000
Subject: [PATCH] GUAC-587: The extension manifest must not be null.

---
 .../org/glyptodon/guacamole/net/basic/extension/Extension.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/Extension.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/Extension.java
index 2f3aa17c4..a7891cb4d 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/Extension.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/Extension.java
@@ -226,6 +226,8 @@ public class Extension {
 
                 // Parse manifest
                 manifest = mapper.readValue(extension.getInputStream(manifestEntry), ExtensionManifest.class);
+                if (manifest == null)
+                    throw new GuacamoleServerException("Contents of " + MANIFEST_NAME + " must be a valid JSON object.");
 
             }