diff --git a/client/tomcatconf/log4j-cloud.xml.in b/client/tomcatconf/log4j-cloud.xml.in index a33127524c4..0876507796a 100755 --- a/client/tomcatconf/log4j-cloud.xml.in +++ b/client/tomcatconf/log4j-cloud.xml.in @@ -66,6 +66,10 @@ + + + + diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/com/cloud/agent/transport/Request.java index ffc3e2acee9..021352dc8c7 100755 --- a/core/src/com/cloud/agent/transport/Request.java +++ b/core/src/com/cloud/agent/transport/Request.java @@ -221,7 +221,12 @@ public class Request { public Command[] getCommands() { if (_cmds == null) { - _cmds = s_gson.fromJson(_content, Command[].class); + try { + _cmds = s_gson.fromJson(_content, Command[].class); + } catch (RuntimeException e) { + s_logger.error("Caught problem with " + _content, e); + throw e; + } } return _cmds; } @@ -313,9 +318,9 @@ public class Request { if (_cmds == null) { try { _cmds = s_gson.fromJson(_content, this instanceof Response ? Answer[].class : Command[].class); - } catch (Exception e) { + } catch (RuntimeException e) { s_logger.error("Unable to convert to json: " + _content); - return null; + throw e; } } try {