Changeset 8318ca0 in guacamole-common

Timestamp:

03/26/12 14:34:42 (14 months ago)

Author:

zhangmaike

Branches:

master, guacamole-debian-parent, unstable

Children:

2469313

Parents:

ff3b9d9

git-author:

Michael Jumper <zhangmaike@…> (03/26/12 14:34:42)

git-committer:

Michael Jumper <zhangmaike@…> (03/26/12 14:34:42)

Message:

Add isOpen() to socket and tunnel. Add getSocket() to tunnel.

Location:

src/main/java/net/sourceforge/guacamole

Files:

• net/GuacamoleSocket.java (modified) (1 diff)
• net/GuacamoleTunnel.java (modified) (3 diffs)
• net/InetGuacamoleSocket.java (modified) (1 diff)
• protocol/ConfiguredGuacamoleSocket.java (modified) (1 diff)
• servlet/GuacamoleHTTPTunnelServlet.java (modified) (3 diffs)

src/main/java/net/sourceforge/guacamole/net/GuacamoleSocket.java

@@ -77 +77 @@
     public void close() throws GuacamoleException;
 
+    /**
+     * Returns whether this GuacamoleSocket is open and can be used for reading
+     * and writing.
+     * 
+     * @return true if this GuacamoleSocket is open, false otherwise.
+     */
+    public boolean isOpen();
+
 }

src/main/java/net/sourceforge/guacamole/net/GuacamoleTunnel.java

@@ -57 +57 @@
     private ReentrantLock readerLock;
     private ReentrantLock writerLock;
+
+    private boolean open = true;
 
     /**
@@ -148 +150 @@
 
     /**
+     * Returns the GuacamoleSocket used by this GuacamoleTunnel for reading
+     * and writing.
+     * 
+     * @return The GuacamoleSocket used by this GuacamoleTunnel.
+     */
+    public GuacamoleSocket getSocket() {
+        return socket;
+    }
+
+    /**
      * Release all resources allocated to this GuacamoleTunnel.
      * 
@@ -157 +169 @@
     }
 
+    /**
+     * Returns whether this GuacamoleTunnel is open, or has been closed.
+     * 
+     * @return true if this GuacamoleTunnel is open, false if it is closed.
+     */
+    public boolean isOpen() {
+        return socket.isOpen();
+    }
+    
 }

src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java

@@ -133 +133 @@
     }
 
+    @Override
+    public boolean isOpen() {
+        return !sock.isClosed();
+    }
+    
 
 }

src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java

@@ -122 +122 @@
     }
 
+    @Override
+    public boolean isOpen() {
+        return socket.isOpen();
+    }
+
 }

src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java

@@ -228 +228 @@
         GuacamoleSession session = new GuacamoleSession(httpSession);
 
+        // Get tunnel, ensure tunnel exists
         GuacamoleTunnel tunnel = session.getTunnel(tunnelUUID);
         if (tunnel == null)
             throw new GuacamoleResourceNotFoundException("No such tunnel.");
 
+        // Ensure tunnel is open
+        if (!tunnel.isOpen())
+            throw new GuacamoleResourceNotFoundException("Tunnel is closed.");
+        
         // Obtain exclusive read access
         GuacamoleReader reader = tunnel.acquireReader();
@@ -266 +271 @@
                     break;
 
-            } while ((message = reader.read()) != null);
+            } while (tunnel.isOpen() && (message = reader.read()) != null);
 
             // Close tunnel immediately upon EOF
@@ -341 +346 @@
 
             int length;
-            while ((length = input.read(buffer, 0, buffer.length)) != -1)
+            while (tunnel.isOpen() && 
+                    (length = input.read(buffer, 0, buffer.length)) != -1)
                 writer.write(buffer, 0, length);