svn commit: r1067600 - /shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java

[lindner]

Author: lindner
Date: Sun Feb  6 05:59:40 2011
New Revision: 1067600

URL: http://svn.apache.org/viewvc?rev=1067600&view=rev
Log:
simplification of converter selection logic

Modified:
    
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java

Modified: 
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java?rev=1067600&r1=1067599&r2=1067600&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
 (original)
+++ 
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
 Sun Feb  6 05:59:40 2011
@@ -205,7 +205,7 @@ public class DataServiceServlet extends 
 
   public BeanConverter getConverterForRequest(HttpServletRequest 
servletRequest) {
     String formatString = null;
-    BeanConverter converter = null;
+    BeanConverter converter = jsonConverter; // default is jsonConverter
     String contentType = null;
 
     try {
@@ -227,7 +227,6 @@ public class DataServiceServlet extends 
       }
     }
 
-
     if (contentType != null) {
       if (ContentTypes.ALLOWED_JSON_CONTENT_TYPES.contains(contentType)) {
         converter = jsonConverter;
@@ -235,9 +234,6 @@ public class DataServiceServlet extends 
         converter = atomConverter;
       } else if (ContentTypes.ALLOWED_XML_CONTENT_TYPES.contains(contentType)) 
{
         converter = xmlConverter;
-      } else if (formatString == null) {
-        // takes care of cases where content!= null but is ""
-        converter = jsonConverter;
       }
     } else if (formatString != null) {
       if (formatString.equals(ATOM_FORMAT)) {
@@ -247,8 +243,6 @@ public class DataServiceServlet extends 
       } else {
         converter = jsonConverter;
       }
-    } else {
-      converter = jsonConverter;
     }
     return converter;
   }