Cleaned up code based on Vinoth's review

vidyasagar1729 · Jun 6, 2013 · f6e7b9c · f6e7b9c
1 parent b8af33d
commit f6e7b9c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/java/voldemort/coordinator/GetSchemataRequestExecutor.java b/src/java/voldemort/coordinator/GetSchemataRequestExecutor.java
@@ -6,6 +6,8 @@
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.OK;
 import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
+import java.io.UnsupportedEncodingException;
+
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
 import org.apache.log4j.Logger;
@@ -51,7 +53,11 @@ public void run() {
 
         record.put("key-serializer", keySerializer);
         record.put("value-serializer", valueSerializer);
-        writeResponse(record.toString().getBytes());
+        try {
+            writeResponse(record.toString().getBytes("UTF-8"));
+        } catch(UnsupportedEncodingException e) {
+            logger.error(e);
+        }
     }
 
     public void writeResponse(byte[] responseValue) {

diff --git a/src/java/voldemort/coordinator/VoldemortHttpRequestHandler.java b/src/java/voldemort/coordinator/VoldemortHttpRequestHandler.java
@@ -218,15 +218,6 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Ex
                                                                 "UTF-8");
                         fatClientWrapper = this.fatClientMap.get(queryStore);
 
-                        if(queryStore == null || fatClientWrapper == null) {
-                            this.errorStats.reportException(new IllegalArgumentException());
-                            handleBadRequest(e, "Invalid store name. Critical error.");
-                            return;
-                        }
-
-                        fatClientWrapper.submitGetSchemataRequest(e);
-                        return;
-
                     } else {
                         fatClientWrapper = this.fatClientMap.get(storeName);
                     }
@@ -249,6 +240,11 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Ex
                         if(logger.isDebugEnabled()) {
                             logger.debug("Incoming get request");
                         }
+                        if(storeName.equalsIgnoreCase(SCHEMATA)) {
+                            fatClientWrapper.submitGetSchemataRequest(e);
+                            return;
+                        }
+
                         fatClientWrapper.submitGetRequest(requestObject, e, startTimeStampInNs);
                         break;
                     case VoldemortOpCode.GET_ALL_OP_CODE: