diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-03-17 15:18:53 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-03-17 15:18:53 -0400 |
| commit | 7a386b67863e354564f23e9cb39df4cc29679b32 (patch) | |
| tree | 91e9aacdf28dfff8cc571a5bf93aeff12f6f8ed7 /java/src/IceGridGUI/LiveDeployment/Service.java | |
| parent | Better signing (diff) | |
| parent | Fixed bug 2822 & test/Ice/hold test hang on Windows XP (diff) | |
| download | ice-7a386b67863e354564f23e9cb39df4cc29679b32.tar.bz2 ice-7a386b67863e354564f23e9cb39df4cc29679b32.tar.xz ice-7a386b67863e354564f23e9cb39df4cc29679b32.zip | |
Merge branch 'master' of ssh://git/home/git/ice
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/Service.java')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/Service.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java index c254d88d900..f8c05aacaef 100755 --- a/java/src/IceGridGUI/LiveDeployment/Service.java +++ b/java/src/IceGridGUI/LiveDeployment/Service.java @@ -194,13 +194,7 @@ class Service extends ListArrayTreeNode DeploymentException { AdminSessionPrx session = getRoot().getCoordinator().getSession(); - FileIteratorPrx result = session.openServerLog(_parent.getId(), fPath, count); - if(getRoot().getCoordinator().getCommunicator().getDefaultRouter() == null) - { - result = FileIteratorPrxHelper.uncheckedCast( - result.ice_endpoints(session.ice_getEndpoints())); - } - return result; + return session.openServerLog(_parent.getId(), fPath, count); } public String getTitle() @@ -229,7 +223,7 @@ class Service extends ListArrayTreeNode { _cellRenderer = new DefaultTreeCellRenderer(); - _startedIcon = Utils.getIcon("/icons/16x16/service_started.png"); + _startedIcon = Utils.getIcon("/icons/16x16/service_running.png"); _stoppedIcon = Utils.getIcon("/icons/16x16/service.png"); } |