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/09/18 11:29:41 UTC
[1/2] git commit: updated refs/heads/master to bfa36c0
Repository: cloudstack
Updated Branches:
refs/heads/master 032bce5b5 -> bfa36c028
CID-1116231: Use implicit lock, synchronize _key in Link
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/ec134cf0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec134cf0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec134cf0
Branch: refs/heads/master
Commit: ec134cf0105c6c9a147825d22d8a5d95af44c855
Parents: 032bce5
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 18 11:21:09 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 18 11:21:57 2014 +0200
----------------------------------------------------------------------
utils/src/com/cloud/utils/nio/Link.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec134cf0/utils/src/com/cloud/utils/nio/Link.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java
index e4291d0..c295caf 100755
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -92,7 +92,9 @@ public class Link {
}
public void setKey(SelectionKey key) {
- _key = key;
+ synchronized (this) {
+ _key = key;
+ }
}
public void setSSLEngine(SSLEngine sslEngine) {
[2/2] git commit: updated refs/heads/master to bfa36c0
Posted by bh...@apache.org.
CID-1233090, CID-1233089: Synchronize on session object in ApiServer
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/bfa36c02
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bfa36c02
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bfa36c02
Branch: refs/heads/master
Commit: bfa36c028049d2d3854d9c58a1fc9f9015e87a79
Parents: ec134cf
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 18 11:26:20 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 18 11:26:20 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServer.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bfa36c02/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 4357230..4b770fc 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -937,13 +937,16 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
response.setTimeout(session.getMaxInactiveInterval());
final String user_UUID = (String)session.getAttribute("user_UUID");
- session.removeAttribute("user_UUID");
response.setUserId(user_UUID);
final String domain_UUID = (String)session.getAttribute("domain_UUID");
- session.removeAttribute("domain_UUID");
response.setDomainId(domain_UUID);
+ synchronized (session) {
+ session.removeAttribute("user_UUID");
+ session.removeAttribute("domain_UUID");
+ }
+
final Enumeration attrNames = session.getAttributeNames();
if (attrNames != null) {
while (attrNames.hasMoreElements()) {