Code cleanup

1 files changed, 22 insertions, 6 deletions

diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index db49207138d..e3b4b7a87de 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -195,38 +195,54 @@ AdminSessionI::getReplicaName(const Ice::Current& current) const
 FileIteratorPrx 
 AdminSessionI::openServerStdOut(const std::string& id, const Ice::Current& current)
 {
-    return addFileIterator(_database->getServer(id), "stdout", current);
+    return addFileIterator(_database->getServer(id)->getProxy(), "stdout", current);
 }
 
 FileIteratorPrx 
 AdminSessionI::openServerStdErr(const std::string& id, const Ice::Current& current)
 {
-    return addFileIterator(_database->getServer(id), "stderr", current);
+    return addFileIterator(_database->getServer(id)->getProxy(), "stderr", current);
 }
 
 FileIteratorPrx 
 AdminSessionI::openNodeStdOut(const std::string& name, const Ice::Current& current)
 {
-    return addFileIterator(_database->getNode(name), "stdout", current);
+    return addFileIterator(_database->getNode(name)->getProxy(), "stdout", current);
 }
 
 FileIteratorPrx 
 AdminSessionI::openNodeStdErr(const std::string& name, const Ice::Current& current)
 {
-    return addFileIterator(_database->getNode(name), "stderr", current);
+    return addFileIterator(_database->getNode(name)->getProxy(), "stderr", current);
 }
 
 FileIteratorPrx 
 AdminSessionI::openRegistryStdOut(const std::string& name, const Ice::Current& current)
 {
-    FileReaderPrx reader = name == _replicaName ? _database->getInternalRegistry() : _database->getReplica(name);
+    FileReaderPrx reader;
+    if(name == _replicaName)
+    {
+	reader = _database->getReplicaCache().getInternalRegistry();
+    }
+    else
+    {
+	reader = _database->getReplica(name)->getProxy();
+    }
     return addFileIterator(reader, "stdout", current);
 }
 
 FileIteratorPrx
 AdminSessionI::openRegistryStdErr(const std::string& name, const Ice::Current& current)
 {
-    FileReaderPrx reader = name == _replicaName ? _database->getInternalRegistry() : _database->getReplica(name);
+    FileReaderPrx reader;
+    if(name == _replicaName)
+    {
+	reader = _database->getReplicaCache().getInternalRegistry();
+    }
+    else
+    {
+	reader = _database->getReplica(name)->getProxy();
+    }
     return addFileIterator(reader, "stderr", current);
 }