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

Use appropriate exceptions where possible, turn exceptions into appropriate error codes.

Browse Source
This commit is contained in:
Michael Jumper
2012-03-24 22:03:52 -07:00
parent f42fe962e2
commit 9b36638bf3
7 changed files with 75 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java
View File

@@ -41,6 +41,7 @@ import java.io.IOException;
import java.io.Reader;
import java.util.LinkedList;
import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.GuacamoleServerException;
import net.sourceforge.guacamole.protocol.GuacamoleInstruction;
import net.sourceforge.guacamole.protocol.GuacamoleInstruction.Operation;
import org.apache.commons.lang3.ArrayUtils;
@@ -79,7 +80,7 @@ public class ReaderGuacamoleReader implements GuacamoleReader {
return input.ready() || usedLength != 0;
}
catch (IOException e) {
throw new GuacamoleException(e);
throw new GuacamoleServerException(e);
}
}
@@ -144,7 +145,7 @@ public class ReaderGuacamoleReader implements GuacamoleReader {
// Handle invalid terminator characters
else if (terminator != ',')
throw new GuacamoleException("Element terminator of instruction was not ';' nor ','");
throw new GuacamoleServerException("Element terminator of instruction was not ';' nor ','");
}
@@ -156,7 +157,7 @@ public class ReaderGuacamoleReader implements GuacamoleReader {
// Otherwise, parse error
else
throw new GuacamoleException("Non-numeric character in element length.");
throw new GuacamoleServerException("Non-numeric character in element length.");
}
@@ -179,7 +180,7 @@ public class ReaderGuacamoleReader implements GuacamoleReader {
}
catch (IOException e) {
throw new GuacamoleException(e);
throw new GuacamoleServerException(e);
}
}

3
guacamole-common/src/main/java/net/sourceforge/guacamole/io/WriterGuacamoleWriter.java
View File

@@ -40,6 +40,7 @@ package net.sourceforge.guacamole.io;
import java.io.IOException;
import java.io.Writer;
import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.GuacamoleServerException;
import net.sourceforge.guacamole.protocol.GuacamoleInstruction;
/**
@@ -72,7 +73,7 @@ public class WriterGuacamoleWriter implements GuacamoleWriter {
output.flush();
}
catch (IOException e) {
throw new GuacamoleException(e);
throw new GuacamoleServerException(e);
}
}