1 files changed, 19 insertions, 0 deletions
diff --git a/js/src/Ice/ObjectAdapterI.js b/js/src/Ice/ObjectAdapterI.js
index ec069e75fa8..a65e3f30ece 100644
--- a/js/src/Ice/ObjectAdapterI.js
+++ b/js/src/Ice/ObjectAdapterI.js
@@ -44,6 +44,7 @@ var _suffixes =
     "Locator.PreferSecure",
     "Locator.CollocationOptimized",
     "Locator.Router",
+    "MessageSizeMax",
     "PublishedEndpoints",
     "RegisterProcess",
     "ReplicaGroupId",
@@ -97,6 +98,7 @@ var ObjectAdapterI = Ice.Class({
         if(this._noConfig)
         {
             this._reference = this._instance.referenceFactory().createFromString("dummy -t", "");
+            this._messageSizeMax = this._instance.messageSizeMax();
             promise.succeed(this, promise);
             return;
         }
@@ -151,6 +153,19 @@ var ObjectAdapterI = Ice.Class({
             }
         }
 
+        {
+            var defaultMessageSizeMax = this._instance.messageSizeMax() / 1024;
+            var num = properties.getPropertyAsIntWithDefault(this._name + ".MessageSizeMax", defaultMessageSizeMax);
+            if(num < 1 || num > 0x7fffffff / 1024)
+            {
+                this._messageSizeMax = 0x7fffffff;
+            }
+            else
+            {
+                this._messageSizeMax = num * 1024; // Property is in kilobytes, _messageSizeMax in bytes
+            }
+        }
+
         try
         {
             
@@ -461,6 +476,10 @@ var ObjectAdapterI = Ice.Class({
         //
         return this._servantManager;
     },
+    messageSizeMax: function()
+    {
+        return this._messageSizeMax;
+    },
     newProxy: function(ident, facet)
     {
         var endpoints = [];