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 2015/03/06 17:14:46 UTC
[1/2] git commit: updated refs/heads/master to ec2639e
Repository: cloudstack
Updated Branches:
refs/heads/master ff7ef985f -> ec2639e8f
server: last cherry-picked commit failed to remove code
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/25b0bd62
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/25b0bd62
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/25b0bd62
Branch: refs/heads/master
Commit: 25b0bd620a758532c90c0996a4447d7c32048ab9
Parents: ff7ef98
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sat Feb 28 18:24:44 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Mar 6 21:44:24 2015 +0530
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServlet.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25b0bd62/server/src/com/cloud/api/ApiServlet.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index 1fd16ba..dccc9e7 100644
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -161,14 +161,6 @@ public class ApiServlet extends HttpServlet {
}
HttpSession session = req.getSession(false);
- if (ApiServer.isSecureSessionCookieEnabled()) {
- resp.setHeader("SET-COOKIE", "JSESSIONID=" + session.getId() + ";Secure;Path=/client");
- if (s_logger.isDebugEnabled()) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Session cookie is marked secure!");
- }
- }
- }
final Object[] responseTypeParam = params.get(ApiConstants.RESPONSE);
if (responseTypeParam != null) {
responseType = (String)responseTypeParam[0];
[2/2] git commit: updated refs/heads/master to ec2639e
Posted by bh...@apache.org.
CLOUDSTACK-8248: loadCidrs before sending response
Fixes regression from CLOUDSTACK-6582
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit f9090eacd6432856ca7504ebdfce38d65f8d019d)
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/ec2639e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec2639e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec2639e8
Branch: refs/heads/master
Commit: ec2639e8fb46dc0edef9e674b21e57e34b69fa70
Parents: 25b0bd6
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Mar 6 21:42:36 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Mar 6 21:44:28 2015 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec2639e8/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index bee4018..9f61f08 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -600,7 +600,11 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
}
Pair<List<NetworkACLItemVO>, Integer> result = _networkACLItemDao.searchAndCount(sc, filter);
- return new Pair<List<? extends NetworkACLItem>, Integer>(result.first(), result.second());
+ List<NetworkACLItemVO> aclItemVOs = result.first();
+ for (NetworkACLItemVO item: aclItemVOs) {
+ _networkACLItemDao.loadCidrs(item);
+ }
+ return new Pair<List<? extends NetworkACLItem>, Integer>(aclItemVOs, result.second());
}
@Override