Permalink
Browse files

Merge branch 'master' of https://github.com/gegao/h-store

  • Loading branch information...
gegao committed Nov 17, 2013
2 parents 5389c27 + 3ea3825 commit 591ad52015db5018d4a00cc53f8e7a75afaa27f8
@@ -294,7 +294,9 @@ public void execTransactionRequest(LocalTransaction ts) {
LOG.debug("Send execTransactionRequest to the snapshot;");
JVMSnapshotTransactionCallback callback = new JVMSnapshotTransactionCallback(
hstore_site, ts);
channel.execTransactionRequest(new ProtoRpcController(), tr, callback);
ProtoRpcController rpc = new ProtoRpcController();
channel.execTransactionRequest(rpc, tr, callback);
rpc.block();
if (debug.val)
LOG.debug("Send finish;");
@@ -424,13 +426,15 @@ public void run() {
continue;
}
this.execTransactionRequest(ts);
/*
synchronized (this) {
try {
this.wait();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
*/
}
@@ -48,7 +48,7 @@ public void run(TransactionResponse parameter) {
this.hstore_site.responseSend(ts, response);
this.hstore_site.getJvmSnapshotManager().notifyFinish();
//this.hstore_site.getJvmSnapshotManager().notifyFinish();
}

0 comments on commit 591ad52

Please sign in to comment.