Index: src/main/java/org/wso2/carbon/core/multitenancy/MultitenantMessageReceiver.java
===================================================================
--- src/main/java/org/wso2/carbon/core/multitenancy/MultitenantMessageReceiver.java	(revision 169953)
+++ src/main/java/org/wso2/carbon/core/multitenancy/MultitenantMessageReceiver.java	(working copy)
@@ -462,9 +462,11 @@
         OutputStream os = (OutputStream) mainInMsgContext.getProperty("nhttp.output.stream");
         String contentType = (String) mainInMsgContext.getProperty("ContentType");
         try {
-            String httpMethod = (String) mainInMsgContext.getProperty(HTTPConstants.HTTP_METHOD);
+            //String httpMethod = (String) mainInMsgContext.getProperty(HTTPConstants.HTTP_METHOD);
+            String httpMethod = (String) mainInMsgContext.getProperty(Constants.Configuration.HTTP_METHOD);
             if (httpMethod.equals(Constants.Configuration.HTTP_METHOD_GET) ||
-                    httpMethod.equals(Constants.Configuration.HTTP_METHOD_DELETE)) {
+                    httpMethod.equals(Constants.Configuration.HTTP_METHOD_DELETE) ||
+                    httpMethod.equals("OPTIONS")) {
                 //RESTUtil.processURLRequest(tenantInMsgCtx, os, contentType);
             	this.processRESTRequest(tenantInMsgCtx,os,contentType);
             } else if (httpMethod.equals(Constants.Configuration.HTTP_METHOD_POST) ||