projects
/
guacamole.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
64f1801
)
Fixed logger usage.
author
Michael Jumper <zhangmaike@users.sourceforge.net>
Mon, 26 Mar 2012 18:51:14 +0000
(11:51 -0700)
committer
Michael Jumper <zhangmaike@users.sourceforge.net>
Mon, 26 Mar 2012 18:51:14 +0000
(11:51 -0700)
src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
patch
|
blob
|
history
src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
b/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
index
0748495
..
58cfcac
100644
(file)
--- a/
src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
+++ b/
src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
@@
-172,12
+172,12
@@
public class BasicGuacamoleTunnelServlet extends AuthenticatingHttpServlet {
// If no configs/credentials in session, not authorized
if (credentials == null || configs == null)
// If no configs/credentials in session, not authorized
if (credentials == null || configs == null)
- throw new GuacamoleException("Cannot connect - user not logged in.");
+ throw new GuacamoleSecurityException("Cannot connect - user not logged in.");
// Get authorized config
GuacamoleConfiguration config = configs.get(id);
if (config == null) {
// Get authorized config
GuacamoleConfiguration config = configs.get(id);
if (config == null) {
- logger.error("Configuration id={} not found.", id);
+ logger.warn("Configuration id={} not found.", id);
throw new GuacamoleSecurityException("Requested configuration is not authorized.");
}
throw new GuacamoleSecurityException("Requested configuration is not authorized.");
}
diff --git
a/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java
b/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java
index
5504637
..
3fe0ea5
100644
(file)
--- a/
src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java
+++ b/
src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java
@@
-79,10
+79,10
@@
public class WebSocketSupportLoader implements ServletContextListener {
// Servlet API 3.0 unsupported
catch (ClassNotFoundException e) {
// Servlet API 3.0 unsupported
catch (ClassNotFoundException e) {
- logger.error("Servlet API 3.0 not found.", e);
+ logger.info("Servlet API 3.0 not found.", e);
}
catch (NoSuchMethodException e) {
}
catch (NoSuchMethodException e) {
- logger.error("Servlet API 3.0 found, but incomplete.", e);
+ logger.warn("Servlet API 3.0 found, but incomplete.", e);
}
// Servlet API 3.0 found, but errors during use
}
// Servlet API 3.0 found, but errors during use