You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/24 19:26:05 UTC
[09/13] git commit: updated refs/heads/4.3 to 15ded4f
Fix build failure from cherry-picked commits
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11d446a0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11d446a0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11d446a0
Branch: refs/heads/4.3
Commit: 11d446a0d80bce428420667a8b82f72742c9d8fe
Parents: ed90e0c
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Nov 24 21:52:23 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 24 23:47:04 2014 +0530
----------------------------------------------------------------------
.../async/AsyncCallbackDispatcher.java | 22 +++-----------------
server/src/com/cloud/api/ApiServer.java | 2 +-
2 files changed, 4 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11d446a0/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
index 73bb314..be50eec 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
@@ -102,25 +102,9 @@ public class AsyncCallbackDispatcher<T, R> implements AsyncCompletionCallback {
} catch (Throwable e) {
s_logger.error("Unexpected exception", e);
}
- });
- en.setCallbackFilter(new CallbackFilter() {
- @Override
- public int accept(Method method) {
- if (method.getParameterTypes().length == 0 && method.getName().equals("finalize")) {
- return 1;
- }
- return 0;
- }}
- );
-
- try {
- return (T)en.create();
- } catch(Throwable e) {
- s_logger.error("Unexpected exception", e);
- }
-
- return null;
- }
+
+ return null;
+ }
public AsyncCallbackDispatcher<T, R> setCallback(Object useless) {
return this;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11d446a0/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 9041a59..7aac28f 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -1065,7 +1065,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
conn.bind(socket, _params);
// Execute a new worker task to handle the request
- _executor.execute(new WorkerTask(_httpService, conn, _workerCount++));
+ s_executor.execute(new WorkerTask(_httpService, conn, _workerCount++));
} catch (InterruptedIOException ex) {
break;
} catch (IOException e) {