Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3639710AA0 for ; Wed, 18 Sep 2013 23:37:32 +0000 (UTC) Received: (qmail 96134 invoked by uid 500); 18 Sep 2013 23:37:32 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 96112 invoked by uid 500); 18 Sep 2013 23:37:31 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 96105 invoked by uid 99); 18 Sep 2013 23:37:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Sep 2013 23:37:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7929A88710A; Wed, 18 Sep 2013 23:37:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 3ab8d8d Date: Wed, 18 Sep 2013 23:37:31 +0000 (UTC) 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 Authored: Wed Sep 18 16:37:00 2013 -0700 Committer: Alena Prokharchyk 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()); }