You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mi...@apache.org on 2013/05/17 04:32:46 UTC

[1/2] git commit: updated refs/heads/master to 973c43a

Updated Branches:
  refs/heads/master 35de50deb -> 973c43a15


fix null pointer dereference in cloud-server


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ed9e42d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ed9e42d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ed9e42d

Branch: refs/heads/master
Commit: 3ed9e42dd2b000299aeab51681d96eb7c9d74249
Parents: 35de50d
Author: Mice Xia <mi...@tcloudcomputing.com>
Authored: Thu May 16 16:50:29 2013 +0800
Committer: Mice Xia <mi...@tcloudcomputing.com>
Committed: Fri May 17 09:44:01 2013 +0800

----------------------------------------------------------------------
 .../cloud/network/StorageNetworkManagerImpl.java   |    5 +++--
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ed9e42d/server/src/com/cloud/network/StorageNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java
index 9a17382..901e204 100755
--- a/server/src/com/cloud/network/StorageNetworkManagerImpl.java
+++ b/server/src/com/cloud/network/StorageNetworkManagerImpl.java
@@ -315,9 +315,10 @@ public class StorageNetworkManagerImpl extends ManagerBase implements StorageNet
         List<StorageNetworkIpRangeVO> ranges = _sNwIpRangeDao.listByPodId(podId);
         for (StorageNetworkIpRangeVO r : ranges) {
             try {
-                r = _sNwIpRangeDao.acquireInLockTable(r.getId());
+                Long rangeId = r.getId();
+                r = _sNwIpRangeDao.acquireInLockTable(rangeId);
                 if (r == null) {
-                    String msg = "Unable to acquire lock on storage network ip range id=" + r.getId() + ", delete failed";
+                    String msg = "Unable to acquire lock on storage network ip range id=" + rangeId + ", delete failed";
                     s_logger.warn(msg);
                     throw new CloudRuntimeException(msg);
                 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ed9e42d/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
index 0622f77..a1865c6 100644
--- a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
+++ b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
@@ -155,7 +155,7 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR
         long gslbRuleId =  assignToGslbCmd.getGlobalLoadBalancerRuleId();
         GlobalLoadBalancerRuleVO gslbRule = _gslbRuleDao.findById(gslbRuleId);
         if (gslbRule == null) {
-            throw new InvalidParameterValueException("Invalid global load balancer rule id: " + gslbRule.getUuid());
+            throw new InvalidParameterValueException("Invalid global load balancer rule id: " + gslbRuleId);
         }
 
         _accountMgr.checkAccess(caller, SecurityChecker.AccessType.ModifyEntry, true, gslbRule);
@@ -282,7 +282,7 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR
         long gslbRuleId =  removeFromGslbCmd.getGlobalLoadBalancerRuleId();
         GlobalLoadBalancerRuleVO gslbRule = _gslbRuleDao.findById(gslbRuleId);
         if (gslbRule == null) {
-            throw new InvalidParameterValueException("Invalid global load balancer rule id: " + gslbRule.getUuid());
+            throw new InvalidParameterValueException("Invalid global load balancer rule id: " + gslbRuleId);
         }
 
         _accountMgr.checkAccess(caller, SecurityChecker.AccessType.ModifyEntry, true, gslbRule);


[2/2] git commit: updated refs/heads/master to 973c43a

Posted by mi...@apache.org.
CLOUDSTACK-2530: fix npe if no network isolation methods

Signed-off-by: Mice Xia <mi...@tcloudcomputing.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/973c43a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/973c43a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/973c43a1

Branch: refs/heads/master
Commit: 973c43a152d39b85f53428b00f451fba9cb82003
Parents: 3ed9e42
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu May 16 07:16:12 2013 -0500
Committer: Mice Xia <mi...@tcloudcomputing.com>
Committed: Fri May 17 10:08:07 2013 +0800

----------------------------------------------------------------------
 .../network/ListNetworkIsolationMethodsCmd.java    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/973c43a1/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
index 7eef22a..0d23fd6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
@@ -44,7 +44,7 @@ public class ListNetworkIsolationMethodsCmd extends BaseListCmd{
                 isolationResponses.add(isolationMethod);
             }
         }
-        response.setResponses(isolationResponses, methods.length);
+        response.setResponses(isolationResponses, isolationResponses.size());
         response.setResponseName(getCommandName());
         this.setResponseObject(response);