Removed maxLines attribute from FileIterator::read() method

1 files changed, 10 insertions, 5 deletions

diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index 6b9ac62d31b..6785fedf70c 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -22,20 +22,22 @@ using namespace IceGrid;
 FileIteratorI::FileIteratorI(const AdminSessionIPtr& session, 
 			     const FileReaderPrx& reader, 
 			     const string& filename,
-			     Ice::Long offset) :
+			     Ice::Long offset,
+			     int messageSizeMax) :
     _session(session),
     _reader(reader),
     _filename(filename),
-    _offset(offset)
+    _offset(offset),
+    _messageSizeMax(messageSizeMax)
 {
 }
 
 bool
-FileIteratorI::read(int nlines, int size, Ice::StringSeq& lines, const Ice::Current& current)
+FileIteratorI::read(int size, Ice::StringSeq& lines, const Ice::Current& current)
 {
     try
     {
-	return _reader->read(_filename, _offset, nlines, size, _offset, lines);
+	return _reader->read(_filename, _offset, size > _messageSizeMax ? _messageSizeMax : size, _offset, lines);
     }
     catch(const Ice::LocalException& ex)
     {
@@ -321,8 +323,11 @@ AdminSessionI::addFileIterator(const FileReaderPrx& reader,
 	}
     }
 
+    Ice::PropertiesPtr properties = reader->ice_getCommunicator()->getProperties();
+    int messageSizeMax = properties->getPropertyAsIntWithDefault("Ice.MessageSizeMax", 1024) * 1024;
+
     Ice::ObjectPrx obj;
-    Ice::ObjectPtr servant = new FileIteratorI(this, reader, filename, offset);
+    Ice::ObjectPtr servant = new FileIteratorI(this, reader, filename, offset, messageSizeMax);
     if(_servantLocator)
     {
 	obj = _servantLocator->add(servant, current.con);