Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #129 from zznate/halffixcomposite

Half way
  • Loading branch information...
commit 8fb0c984a2d4a86479b38d0c88d826cb7735b45b 2 parents 0e4a113 + c8b7580
@zznate authored
View
5 src/main/java/org/usergrid/vx/experimental/IntraService.java
@@ -33,6 +33,7 @@
import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.vertx.java.core.Vertx;
+import org.vertx.java.core.json.JsonArray;
public class IntraService {
@@ -82,7 +83,9 @@ public Boolean call() throws Exception {
// TODO remove unused method params
public static Object resolveObject(Object o, IntraReq req, IntraRes res,IntraState state, int i){
- if (o instanceof Object[]){
+ if (o instanceof JsonArray){
+ return ((JsonArray) o).toArray();
+ } else if (o instanceof Object[]){
return o;
} else if (o instanceof Integer){
return o;
View
1  src/main/java/org/usergrid/vx/server/operations/GetHandler.java
@@ -53,6 +53,7 @@ public void handle(Message<JsonObject> event) {
array = HandlerUtils.readCf(cf1, state, params);
}
+ System.out.println(array.toArray());
JsonObject response = new JsonObject();
response.putArray(id.toString(), array);
event.reply(response);
View
2  src/main/java/org/usergrid/vx/server/operations/SetHandler.java
@@ -31,7 +31,7 @@ public void handle(Message<JsonObject> event) {
null,
IntraService.byteBufferForObject(params.getField("name")));
- Object val = params.toMap().get("value");
+ Object val = params.getField("value");
Integer ttl = params.getInteger("ttl");
if (ttl == null) {
Please sign in to comment.
Something went wrong with that request. Please try again.