Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VirtualBox: Removed private propagate-methods and use Google directly instead. Minor code cleanup.

This commit is contained in:
Mattias Holmqvist 2012-01-10 07:31:22 +01:00
parent 2dfdbb4b56
commit 82e44d952b
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/AttachNATAdapterToMachineIfNotAlreadyExists.java
View File

@ -55,7 +55,7 @@ public class AttachNATAdapterToMachineIfNotAlreadyExists implements Function<IMa
networkAdapter.getNatDriver().addRedirect(ruleName, rule.getProtocol(), rule.getHost(), rule.getHostPort(), networkAdapter.getNatDriver().addRedirect(ruleName, rule.getProtocol(), rule.getHost(), rule.getHostPort(),
rule.getGuest(), rule.getGuestPort()); rule.getGuest(), rule.getGuestPort());
} catch (VBoxException e) { } catch (VBoxException e) {
if (e.getMessage().indexOf("already exists") == -1) if (!e.getMessage().contains("already exists"))
throw e; throw e;
} }
} }

12
sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/RetrieveActiveBridgedInterfaces.java
View File

@ -83,7 +83,8 @@ public class RetrieveActiveBridgedInterfaces implements Function<NodeMetadata, L
} }
} catch (SocketException e) { } catch (SocketException e) {
logger.error(e, "Problem in listing network interfaces."); logger.error(e, "Problem in listing network interfaces.");
propagate(e); Throwables.propagate(e);
assert false;
} }
return activeNetworkInterfaceNames; return activeNetworkInterfaceNames;
} }
@ -109,12 +110,6 @@ public class RetrieveActiveBridgedInterfaces implements Function<NodeMetadata, L
return bridgedInterfaceNames; return bridgedInterfaceNames;
} }
protected <T> T propagate(Exception e) {
Throwables.propagate(e);
assert false;
return null;
}
private class IsActiveBridgedInterface implements Predicate<String> { private class IsActiveBridgedInterface implements Predicate<String> {
private NetworkInterface networkInterface; private NetworkInterface networkInterface;
@ -130,7 +125,8 @@ public class RetrieveActiveBridgedInterfaces implements Function<NodeMetadata, L
.isLoopback()); .isLoopback());
} catch (SocketException e) { } catch (SocketException e) {
logger.error(e, "Problem in listing network interfaces."); logger.error(e, "Problem in listing network interfaces.");
propagate(e); Throwables.propagate(e);
assert false;
} }
return false; return false;
} }

9
sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/TakeSnapshotIfNotAlreadyAttached.java
View File

@ -68,18 +68,13 @@ public class TakeSnapshotIfNotAlreadyAttached implements Function<IMachine, ISna
logger.debug("Snapshot %s (description: %s) taken from %s", snapshotName, snapshotDesc, machine.getName()); logger.debug("Snapshot %s (description: %s) taken from %s", snapshotName, snapshotDesc, machine.getName());
} catch (Exception e) { } catch (Exception e) {
logger.error(e, "Problem creating snapshot %s (descripton: %s) from machine %s", snapshotName, snapshotDesc, machine.getName()); logger.error(e, "Problem creating snapshot %s (descripton: %s) from machine %s", snapshotName, snapshotDesc, machine.getName());
propogate(e); Throwables.propagate(e);
assert false;
} finally { } finally {
session.unlockMachine(); session.unlockMachine();
} }
} }
return machine.getCurrentSnapshot(); return machine.getCurrentSnapshot();
} }
protected <T> T propogate(Exception e) {
Throwables.propagate(e);
assert false;
return null;
}
} }