cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/master to 56070c6
Date Wed, 06 Nov 2013 14:18:28 GMT
Updated Branches:
  refs/heads/master f03dcdab1 -> 56070c644


Fix for 1125389 RV: Bad use of return value - make sure the replace call is done after replaceAll
and the correct value is returned

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>


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

Branch: refs/heads/master
Commit: 56070c644b026003b155bdb69b356a286e122a46
Parents: f03dcda
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Wed Nov 6 14:18:31 2013 +0100
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Wed Nov 6 15:17:00 2013 +0100

----------------------------------------------------------------------
 .../network/contrail/management/ContrailManagerImpl.java          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56070c64/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
index ae9bba9..4eaafca 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
@@ -239,8 +239,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager
     @Override
     public String getPhysicalNetworkName(PhysicalNetworkVO phys_net) {
         String physname = phys_net.getName();
-        physname = physname.replaceAll("\\s", "");
-        physname.replace("_", "");
+        physname = physname.replaceAll("\\s", "").replace("_", "");
         return physname;
     }
 


Mime
View raw message