Updated Branches: refs/heads/master d34b79c97 -> 3ab8d8d8f
Fixed non-oss build broken in Juniper SRX with commit 2614b00c513734ce6b1c29e572fbd7a37d4059fc Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ab8d8d8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ab8d8d8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ab8d8d8 Branch: refs/heads/master Commit: 3ab8d8d8f20c453fdc684f177a612922eae5f415 Parents: d34b79c Author: Alena Prokharchyk <[email protected]> Authored: Wed Sep 18 16:37:00 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Wed Sep 18 16:37:00 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/resource/JuniperSrxResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ab8d8d8/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java index e021ad9..684751c 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java @@ -700,7 +700,7 @@ public class JuniperSrxResource implements ServerResource { Long publicVlanTag = null; if (ip.getBroadcastUri() != null && !ip.getBroadcastUri().equals("untagged")) { try { - publicVlanTag = Long.parseLong(BroadcastDomainType.getValue(ip.getVlanId())); + publicVlanTag = Long.parseLong(ip.getBroadcastUri()); } catch (Exception e) { throw new ExecutionException("Could not parse public VLAN tag: " + ip.getBroadcastUri()); }
