svn commit: r751261 - /incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java

[vsiveton]

Author: vsiveton
Date: Sat Mar  7 13:17:28 2009
New Revision: 751261

URL: http://svn.apache.org/viewvc?rev=751261&view=rev
Log:
o merged from r751260

Modified:
    
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java

Modified: 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java?rev=751261&r1=751260&r2=751261&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
 Sat Mar  7 13:17:28 2009
@@ -71,13 +71,7 @@
 
     } catch (IllegalArgumentException e) {
       response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-      if (!logger.isLoggable(Level.OFF)) {
-        if (logger.isLoggable(Level.INFO)) {
-          logger.log(Level.INFO, e.getMessage());
-        } else {
-          logger.log(Level.INFO, e.getMessage(), e);
-        }
-      }
+      logger.log(Level.INFO, e.getMessage(), e);
       return;
     }
 
@@ -135,26 +129,14 @@
       return new Result(resp.toString(), true);
     } catch (UnsupportedEncodingException e) {
       response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-      if (!logger.isLoggable(Level.OFF)) {
-        if (logger.isLoggable(Level.INFO)) {
-          logger.log(Level.INFO, e.getMessage());
-        } else {
-          logger.log(Level.INFO, e.getMessage(), e);
-        }
-      }
+      logger.log(Level.INFO, e.getMessage(), e);
       return new Result("Unsupported input character set", false);
     } catch (JSONException e) {
       response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
       return new Result("Malformed JSON request.", false);
     } catch (RpcException e) {
       response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-      if (!logger.isLoggable(Level.OFF)) {
-        if (logger.isLoggable(Level.INFO)) {
-          logger.log(Level.INFO, e.getMessage());
-        } else {
-          logger.log(Level.INFO, e.getMessage(), e);
-        }
-      }
+      logger.log(Level.INFO, e.getMessage(), e);
       return new Result(e.getMessage(), false);
     }
   }