brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [21/27] incubator-brooklyn git commit: Fixes JcloudsLocationTest.testInvokesCustomizerCallbacks
Date Fri, 29 May 2015 17:22:14 GMT
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 <github@nakomis.com>
Authored: Tue May 19 12:26:21 2015 +0100
Committer: Richard Downer <richard@apache.org>
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) {


Mime
View raw message