cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/4.3 to 2db6c10
Date Sat, 11 Jan 2014 17:11:08 GMT
Updated Branches:
  refs/heads/4.3 b2d5e374d -> 2db6c10c0


Fix Null pointer in CreateVlanIpRangeCmd


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

Branch: refs/heads/4.3
Commit: 2db6c10c07f79b9d0ae415fab9f51d157b5eb599
Parents: b2d5e37
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Sat Jan 11 10:09:52 2014 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Sat Jan 11 10:10:33 2014 -0700

----------------------------------------------------------------------
 .../cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2db6c10c/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
index 9dd448d..82f594a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
@@ -144,7 +144,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
     }
 
     public String getVlan() {
-        if (vlan.isEmpty()) {
+        if (vlan == null || vlan.isEmpty()) {
             vlan = "untagged";
         }
         return vlan;


Mime
View raw message