|
|
@@ -627,10 +627,10 @@ public class StandardNetworkService implements NetworkService { |
|
|
|
// sanity checks |
|
|
|
final List<BubbleNode> nodes = nodeDAO.findByNetwork(network.getUuid()); |
|
|
|
if (!nodes.isEmpty()) { |
|
|
|
throw invalidEx("err.network.restore.nodesExist"); |
|
|
|
throw invalidEx("err.networkRestore.nodesExist"); |
|
|
|
} |
|
|
|
if (network.getState() != BubbleNetworkState.stopped) { |
|
|
|
throw invalidEx("err.network.restore.notStopped"); |
|
|
|
throw invalidEx("err.networkRestore.notStopped"); |
|
|
|
} |
|
|
|
network.setState(BubbleNetworkState.starting); |
|
|
|
networkDAO.update(network); |
|
|
@@ -661,8 +661,14 @@ public class StandardNetworkService implements NetworkService { |
|
|
|
|
|
|
|
return newNodeRequest; |
|
|
|
|
|
|
|
} catch (SimpleViolationException e) { |
|
|
|
// TODO: should this go here, or just in some specific cases within above try block? |
|
|
|
// also, should this go into other method here that are locking network? |
|
|
|
try { unlockNetwork(network.getUuid(), lock); } catch (Exception e1) { } |
|
|
|
log.error("startNetwork: original SimpleViolationException: ", e); |
|
|
|
throw e; |
|
|
|
} catch (Exception e) { |
|
|
|
return die("startNetwork: "+e, e); |
|
|
|
return die("startNetwork: " + e, e); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|