From 1c99f6a8cf45b55f142c8526b81717313abc886c Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 17 Jan 2018 18:41:36 -0800
Subject: [PATCH] GUACAMOLE-96: Rearrange logic of DecoratingDirectory.get() to
 make more intuitive sense.

---
 .../org/apache/guacamole/net/auth/DecoratingDirectory.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DecoratingDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DecoratingDirectory.java
index bb2eac473..dc35e3b6c 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DecoratingDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DecoratingDirectory.java
@@ -99,10 +99,11 @@ public abstract class DecoratingDirectory<ObjectType extends Identifiable>
 
         // Decorate only if object exists
         ObjectType object = super.get(identifier);
-        if (object == null)
-            return object;
+        if (object != null)
+            return decorate(object);
+
+        return null;
 
-        return decorate(object);
     }
 
     @Override