safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed client.

Browse Source
This commit is contained in:
Michael Jumper
2010-09-06 16:17:03 -07:00
parent df72c91b30
commit bf8abcd40e
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
guacamole/client/src/net/sourceforge/guacamole/GuacamoleClient.java
View File

@@ -71,7 +71,7 @@ public class GuacamoleClient extends Client {
} }
} }
private int bufferPos = 0; private int usedLength = 0;
private char[] buffer = new char[20000]; private char[] buffer = new char[20000];
public Instruction nextInstruction(boolean blocking) throws GuacamoleException { public Instruction nextInstruction(boolean blocking) throws GuacamoleException {
@@ -81,11 +81,22 @@ public class GuacamoleClient extends Client {
// While we're blocking, or input is available // While we're blocking, or input is available
while (blocking || input.ready()) { while (blocking || input.ready()) {
int numRead = input.read(buffer, bufferPos, buffer.length - bufferPos); // If past threshold, resize buffer before reading
if (usedLength > buffer.length/2) {
char[] newbuffer = new char[buffer.length*2];
System.arraycopy(newbuffer, 0, buffer, 0, usedLength);
buffer = newbuffer;
}
// Attempt to fill buffer
int numRead = input.read(buffer, usedLength, buffer.length - usedLength);
if (numRead == -1) if (numRead == -1)
return null; return null;
for (int i=bufferPos+numRead-1; i>=bufferPos; i--) { int prevLength = usedLength;
usedLength += numRead;
for (int i=usedLength-1; i>=prevLength; i--) {
char readChar = buffer[i]; char readChar = buffer[i];
@@ -96,8 +107,8 @@ public class GuacamoleClient extends Client {
final String instruction = new String(buffer, 0, i+1); final String instruction = new String(buffer, 0, i+1);
// Reset buffer // Reset buffer
bufferPos = bufferPos + numRead - i - 1; usedLength -= i+1;
System.arraycopy(buffer, i+1, buffer, 0, bufferPos); System.arraycopy(buffer, i+1, buffer, 0, usedLength);
// Return instruction string wrapped in Instruction class // Return instruction string wrapped in Instruction class
return new Instruction() { return new Instruction() {
@@ -111,8 +122,6 @@ public class GuacamoleClient extends Client {
} }
bufferPos += numRead;
} // End read loop } // End read loop
} }