diff options
| author | Jose <jose@zeroc.com> | 2014-10-15 18:18:57 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-15 18:18:57 +0200 |
| commit | c3b126288c58007772717753f622cc2aa6ac9f89 (patch) | |
| tree | cda2b205e168292b9c10d3cf4a5e220fc762b9a7 /java/src/IceGridGUI/LiveDeployment/Server.java | |
| parent | Fix type I made in TestUtil (diff) | |
| download | ice-c3b126288c58007772717753f622cc2aa6ac9f89.tar.bz2 ice-c3b126288c58007772717753f622cc2aa6ac9f89.tar.xz ice-c3b126288c58007772717753f622cc2aa6ac9f89.zip | |
Fixed (ICE-5742) - IceGridGUI exception when you disconnect while patching in progress.
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/Server.java')
| -rw-r--r-- | java/src/IceGridGUI/LiveDeployment/Server.java | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java index 9efdacdbcfa..ce790055380 100644 --- a/java/src/IceGridGUI/LiveDeployment/Server.java +++ b/java/src/IceGridGUI/LiveDeployment/Server.java @@ -76,14 +76,15 @@ public class Server extends ListArrayTreeNode getCoordinator().getStatusBar().setText(prefix); try { - getCoordinator().getAdmin().begin_startServer(_id, new Ice.Callback() + final AdminPrx admin = getCoordinator().getAdmin(); + admin.begin_startServer(_id, new Ice.Callback() { @Override public void completed(final Ice.AsyncResult r) { try { - getCoordinator().getAdmin().end_startServer(r); + admin.end_startServer(r); amiSuccess(prefix); } catch(Ice.UserException ex) @@ -111,7 +112,8 @@ public class Server extends ListArrayTreeNode getCoordinator().getStatusBar().setText(prefix); try { - getCoordinator().getAdmin().begin_stopServer(_id, + final AdminPrx admin = getCoordinator().getAdmin(); + admin.begin_stopServer(_id, new Ice.Callback() { @Override @@ -119,7 +121,7 @@ public class Server extends ListArrayTreeNode { try { - getCoordinator().getAdmin().end_stopServer(r); + admin.end_stopServer(r); amiSuccess(prefix); rebuild(Server.this, false); } @@ -289,7 +291,8 @@ public class Server extends ListArrayTreeNode getCoordinator().getStatusBar().setText(prefix); try { - getCoordinator().getAdmin().begin_sendSignal(_id, s, + final AdminPrx admin = getCoordinator().getAdmin(); + admin.begin_sendSignal(_id, s, new Ice.Callback() { @Override @@ -297,7 +300,7 @@ public class Server extends ListArrayTreeNode { try { - getCoordinator().getAdmin().end_sendSignal(r); + admin.end_sendSignal(r); amiSuccess(prefix); } catch(Ice.UserException ex) @@ -344,7 +347,8 @@ public class Server extends ListArrayTreeNode getCoordinator().getStatusBar().setText(prefix); try { - getCoordinator().getAdmin().begin_patchServer(_id, shutdown == JOptionPane.YES_OPTION, + final AdminPrx admin = getCoordinator().getAdmin(); + admin.begin_patchServer(_id, shutdown == JOptionPane.YES_OPTION, new Ice.Callback() { @Override @@ -352,7 +356,7 @@ public class Server extends ListArrayTreeNode { try { - getCoordinator().getAdmin().end_patchServer(r); + admin.end_patchServer(r); amiSuccess(prefix); } catch(Ice.UserException ex) @@ -379,7 +383,8 @@ public class Server extends ListArrayTreeNode getCoordinator().getStatusBar().setText(prefix); try { - getCoordinator().getAdmin().begin_enableServer(_id, enable, + final AdminPrx admin = getCoordinator().getAdmin(); + admin.begin_enableServer(_id, enable, new Ice.Callback() { @Override @@ -387,7 +392,7 @@ public class Server extends ListArrayTreeNode { try { - getCoordinator().getAdmin().end_enableServer(r); + admin.end_enableServer(r); amiSuccess(prefix); } catch(Ice.UserException ex) |