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/master to 6e902f8
Date Sat, 11 Jan 2014 17:10:15 GMT
Updated Branches:
  refs/heads/master effa4c75b -> 6e902f835


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/6e902f83
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e902f83
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e902f83

Branch: refs/heads/master
Commit: 6e902f8354b2242196a64fc4f98029d0859c32e9
Parents: effa4c7
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:09:52 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/6e902f83/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 ca00382..cd3dd7e 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
@@ -147,7 +147,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