From bb7aed5c1d903acde9c467212b039a05f9eaad0a Mon Sep 17 00:00:00 2001
From: James Muehlner <james.muehlner@guac-dev.org>
Date: Fri, 9 Aug 2013 10:38:40 -0700
Subject: [PATCH] Ticket #263: Fixing build by using root group connection
 directory in CRUD operations.

---
 .../guacamole/net/basic/BasicGuacamoleTunnelServlet.java       | 3 ++-
 .../guacamole/net/basic/crud/connections/Create.java           | 2 +-
 .../guacamole/net/basic/crud/connections/Delete.java           | 2 +-
 .../sourceforge/guacamole/net/basic/crud/connections/List.java | 3 ++-
 .../guacamole/net/basic/crud/connections/Update.java           | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
index c66b9f99f..2df41e586 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
@@ -195,7 +195,8 @@ public class BasicGuacamoleTunnelServlet extends AuthenticatingHttpServlet {
                 throw new GuacamoleSecurityException("Cannot connect - user not logged in.");
 
             // Get connection directory
-            Directory<String, Connection> directory = context.getConnectionDirectory();
+            Directory<String, Connection> directory =
+                context.getRootConnectionGroup().getConnectionDirectory();
 
             // Get authorized connection
             Connection connection = directory.get(id);
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java
index 7a588c8f9..559b18293 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Create.java
@@ -53,7 +53,7 @@ public class Create extends AuthenticatingHttpServlet {
 
         // Attempt to get connection directory
         Directory<String, Connection> directory =
-                context.getConnectionDirectory();
+                context.getRootConnectionGroup().getConnectionDirectory();
 
         // Create config
         GuacamoleConfiguration config = new GuacamoleConfiguration();
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java
index 52ca4e214..6a6abf96e 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Delete.java
@@ -44,7 +44,7 @@ public class Delete extends AuthenticatingHttpServlet {
 
         // Attempt to get connection directory
         Directory<String, Connection> directory =
-                context.getConnectionDirectory();
+                context.getRootConnectionGroup().getConnectionDirectory();
 
         // Remove connection
         directory.remove(identifier);
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java
index 17d031488..4e9d643d4 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/List.java
@@ -97,7 +97,8 @@ public class List extends AuthenticatingHttpServlet {
         response.setCharacterEncoding("UTF-8");
 
         // Get connection directory
-        Directory<String, Connection> directory = context.getConnectionDirectory();
+        Directory<String, Connection> directory =
+                context.getRootConnectionGroup().getConnectionDirectory();
 
         // Sys-admin permission
         Permission systemPermission =
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java
index b78b1674a..9169260c7 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/connections/Update.java
@@ -53,7 +53,7 @@ public class Update extends AuthenticatingHttpServlet {
 
         // Attempt to get connection directory
         Directory<String, Connection> directory =
-                context.getConnectionDirectory();
+                context.getRootConnectionGroup().getConnectionDirectory();
 
         // Create config
         GuacamoleConfiguration config = new GuacamoleConfiguration();