cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/master to db91e54
Date Fri, 14 Feb 2014 11:48:39 GMT
Updated Branches:
  refs/heads/master ce6539bd4 -> db91e54bf


CLOUDSTACK-6112. Adding VPC router to a guest network fails with StringIndexOutOfBoundsException.


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

Branch: refs/heads/master
Commit: db91e54bf3c079e6b9932258f6327585f11cac08
Parents: ce6539b
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Fri Feb 14 17:00:03 2014 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Fri Feb 14 17:01:27 2014 +0530

----------------------------------------------------------------------
 .../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db91e54b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index c0ec41b..9cb37f5 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -270,9 +270,11 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru,
Co
             for (NicTO nicTo : sortNicsByDeviceId(to.getNics())) {
                 sbMacSequence.append(nicTo.getMac()).append("|");
             }
-            sbMacSequence.deleteCharAt(sbMacSequence.length() - 1);
-            String bootArgs = to.getBootArgs();
-            to.setBootArgs(bootArgs + " nic_macs=" + sbMacSequence.toString());
+            if (!sbMacSequence.toString().isEmpty()) {
+                sbMacSequence.deleteCharAt(sbMacSequence.length() - 1);
+                String bootArgs = to.getBootArgs();
+                to.setBootArgs(bootArgs + " nic_macs=" + sbMacSequence.toString());
+            }
 
         }
 


Mime
View raw message