From b9d4d657149cd466bd79d43ce9b568353aab468f Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Mon, 11 Jul 2011 14:17:12 -0700
Subject: [PATCH] more logging to figure out problems with gson

---
 client/tomcatconf/log4j-cloud.xml.in            |  4 ++++
 core/src/com/cloud/agent/transport/Request.java | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

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 @@
      <priority value="DEBUG"/>
    </category>
    
+   <category name="com.cloud.utils.nio">
+     <priority value="INFO"/>
+   </category>
+   
    <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
    <category name="org.apache">
       <priority value="INFO"/>
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 {