Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0DA8517754 for ; Fri, 29 May 2015 17:22:19 +0000 (UTC) Received: (qmail 43250 invoked by uid 500); 29 May 2015 17:22:19 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 43226 invoked by uid 500); 29 May 2015 17:22:19 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 43186 invoked by uid 99); 29 May 2015 17:22:18 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 May 2015 17:22:18 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 8AF23C0B79 for ; Fri, 29 May 2015 17:22:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id eNTvgUMZmZaT for ; Fri, 29 May 2015 17:22:05 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 22BCC47C00 for ; Fri, 29 May 2015 17:21:56 +0000 (UTC) Received: (qmail 41505 invoked by uid 99); 29 May 2015 17:21:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 May 2015 17:21:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2F5CFE1102; Fri, 29 May 2015 17:21:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.incubator.apache.org Date: Fri, 29 May 2015 17:22:14 -0000 Message-Id: In-Reply-To: <2e32313e76084e1691aed3843ca1784a@git.apache.org> References: <2e32313e76084e1691aed3843ca1784a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/27] incubator-brooklyn git commit: Fixes JcloudsLocationTest.testInvokesCustomizerCallbacks Fixes JcloudsLocationTest.testInvokesCustomizerCallbacks Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f4e46d3f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f4e46d3f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f4e46d3f Branch: refs/heads/master Commit: f4e46d3f28c594144b7818fdd00757e11d665340 Parents: 90d217d Author: Martin Harris Authored: Tue May 19 12:26:21 2015 +0100 Committer: Richard Downer Committed: Thu May 28 17:27:35 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/brooklyn/location/jclouds/JcloudsLocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4e46d3f/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java index 7a2a0da..df1c089 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java @@ -2017,7 +2017,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im try { // FIXME: Needs to release port forwarding for WinRmMachineLocations - if (machine.getMachineDetails() != null && machine.getMachineDetails().getOsDetails() != null && !machine.getMachineDetails().getOsDetails().isWindows()) { + if (machine instanceof SshMachineLocation) { releasePortForwarding((SshMachineLocation)machine); } } catch (Exception e) {