You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/17 12:53:50 UTC
incubator-ignite git commit: #ignite-961: fix class
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-961 7b793af9d -> e80010e86
#ignite-961: fix class
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e80010e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e80010e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e80010e8
Branch: refs/heads/ignite-961
Commit: e80010e86e7a627ced958099e5bd8aeeda9a4671
Parents: 7b793af
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Jul 17 13:53:37 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Jul 17 13:53:37 2015 +0300
----------------------------------------------------------------------
.../processors/rest/JettyRestProcessorAbstractSelfTest.java | 4 +---
.../internal/processors/scripting/IgniteScriptingProcessor.java | 2 +-
modules/nodejs/src/main/js/server.js | 2 +-
.../rest/protocols/http/jetty/GridJettyRestHandler.java | 5 +++--
4 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e80010e8/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 67913e4..9504dc6 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -123,7 +123,7 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS
conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "application/POST");
+ conn.setRequestProperty("Content-Type", "application/json");
String signature = signature();
@@ -132,8 +132,6 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS
conn.setRequestProperty("Content-Length", Integer.toString(data.length));
- conn.setRequestProperty("JSONObject", "true");
-
conn.setUseCaches(false);
conn.setDoOutput(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e80010e8/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
index db283b8..bf8bbf4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java
@@ -37,7 +37,7 @@ public class IgniteScriptingProcessor extends GridProcessorAdapter {
/** Rest converter. */
private static final String REST_CONV_CLS =
- "org.apache.ignite.internal.processors.rest.protocols.http.jetty.GlassFishScriptingConverter";
+ "org.apache.ignite.internal.processors.rest.protocols.http.jetty.RestGlassFishScriptingConverter";
/** Javascript engine. */
private ScriptEngine jsEngine;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e80010e8/modules/nodejs/src/main/js/server.js
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/main/js/server.js b/modules/nodejs/src/main/js/server.js
index f8a98ab..33e1a0d 100644
--- a/modules/nodejs/src/main/js/server.js
+++ b/modules/nodejs/src/main/js/server.js
@@ -75,7 +75,7 @@ Server.prototype.runCommand = function(cmd, callback) {
if (cmd._isPost()) {
options.headers['Content-Length'] = cmd.postData().length;
- options.headers['JSONObject'] = "true";
+ options.headers['Content-Type'] = "application/json";
}
function streamCallback(response) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e80010e8/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index c2e6885..d0ae096 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -330,7 +330,8 @@ public class GridJettyRestHandler extends AbstractHandler {
*/
private void createResponse(HttpServletRequest req, GridRestCommand cmd,
GridRestResponse cmdRes) {
- if (cmdRes.getResponse() == null || req.getHeader("JSONObject") == null)
+ if (cmdRes.getResponse() == null || !(req.getHeader("Content-Type") != null &&
+ req.getHeader("Content-Type").contains("json")))
return;
if (cmd == CACHE_GET_ALL) {
@@ -415,7 +416,7 @@ public class GridJettyRestHandler extends AbstractHandler {
String cacheName = (String)params.get("cacheName");
- if (req.getHeader("JSONObject") != null) {
+ if (req.getHeader("Content-Type") != null && req.getHeader("Content-Type").contains("json")) {
Object o = ctx.scripting().toJavaObject(parseRequest(req));
Map<Object, Object> map = new HashMap<>();