From 349fac9d1a31e63b253b515e07823781fb483940 Mon Sep 17 00:00:00 2001
From: Virtually Nick <vnick@apache.org>
Date: Wed, 24 Jun 2020 20:38:48 -0400
Subject: [PATCH] GUACAMOLE-678: Return null for null property values.

---
 .../org/apache/guacamole/properties/URIGuacamoleProperty.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
index d40f91e36..7f53bf834 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/URIGuacamoleProperty.java
@@ -32,6 +32,10 @@ public abstract class URIGuacamoleProperty implements GuacamoleProperty<URI> {
     @Override
     public URI parseValue(String value) throws GuacamoleException {
         
+        // If nothing is provided, just return null.
+        if (value == null)
+            return null;
+        
         try {
             return new URI(value);
         }