@openui5/sap.ui.core 1.117.1 → 1.119.0

package/src/sap/ui/model/odata/type/Currency.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Currency
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 */
 	var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
 		constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Date.js

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Date
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTime.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.DateTime
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTimeBase.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.27.0
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 */
 	var DateTimeBase = ODataType.extend("sap.ui.model.odata.type.DateTimeBase", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/DateTimeOffset.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]
@@ -239,6 +239,9 @@ sap.ui.define([
 	/**
 	 * Returns the model value for the given ISO string.
 	 *
+	 * In case the <code>V4</code> constraint is set to <code>true</code>, the milliseconds part of the string is
+	 * either truncated or padded with <code>0</code>, so that its length fits the types precision constraint.
+	 *
 	 * @param {string|null} sISOString
 	 *   A string according to ISO 8601, as returned by {@link #getISOStringFromModelValue}
 	 * @returns {string|Date|module:sap/ui/core/date/UI5Date|null}
@@ -254,7 +257,9 @@ sap.ui.define([
 			return null;
 		}
 
-		return this.bV4 ? sISOString : UI5Date.getInstance(sISOString);
+		return this.bV4
+			? this.getModelFormat().format(UI5Date.getInstance(sISOString), true)
+			: UI5Date.getInstance(sISOString);
 	};
 
 	/**

package/src/sap/ui/model/odata/type/DateTimeWithTimezone.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @public
 	 * @see {sap.ui.model.odata.v2.ODataModel#bindProperty}
 	 * @since 1.99.0
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 */
 	var DateTimeWithTimezone = CompositeType.extend("sap.ui.model.odata.type.DateTimeWithTimezone",
 		{
@@ -228,7 +228,6 @@ sap.ui.define([
 	 * @returns {string|undefined}
 	 *   The language-dependent placeholder text or <code>undefined</code> if the type does not offer a placeholder
 	 *
-	 * @experimental As of version 1.114.0
 	 * @public
 	 */
 	DateTimeWithTimezone.prototype.getPlaceholderText = function () {

package/src/sap/ui/model/odata/type/Decimal.js

@@ -171,7 +171,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Decimal
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Double.js

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Double
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Guid.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Guid
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int.js

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.Int

package/src/sap/ui/model/odata/type/Int16.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Int16
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int32.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Int32
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int64.js

@@ -119,7 +119,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Int64
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/ODataType.js

@@ -116,7 +116,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.ODataType
@@ -158,7 +158,7 @@ sap.ui.define([
 	 */
 	ODataType.prototype.checkParseEmptyValueToZero = function () {
 		if (this.oFormatOptions && this.oFormatOptions.parseEmptyValueToZero
-			&& (!this.oConstraints || this.oConstraints && this.oConstraints.nullable !== false)) {
+			&& (!this.oConstraints || this.oConstraints.nullable !== false)) {
 			Log.warning("The parseEmptyValueToZero format option is ignored as the nullable constraint"
 				+ " is not false.", null, this.getName());
 		}
@@ -203,7 +203,6 @@ sap.ui.define([
 	 * @returns {string|undefined}
 	 *   The language-dependent placeholder text or <code>undefined</code> if the type does not offer a placeholder
 	 *
-	 * @experimental As of version 1.114.0
 	 * @public
 	 */
 	ODataType.prototype.getPlaceholderText = function () {

package/src/sap/ui/model/odata/type/Raw.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 */
 	var Raw = ODataType.extend("sap.ui.model.odata.type.Raw", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/SByte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Single.js

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Single
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Stream.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.51.0
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/String.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Time.js

@@ -138,7 +138,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/TimeOfDay.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 */
 	var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
 			constructor : function (oFormatOptions, oConstraints) {
@@ -292,6 +292,8 @@ sap.ui.define([
 
 	/**
 	 * Returns the model value for the given ISO string.
+	 * The milliseconds part of the string is either truncated or padded with <code>0</code>, so that its length
+	 * fits the types precision constraint.
 	 *
 	 * @param {string|null} sISOString
 	 *   A string according to ISO 8601, as returned by {@link #getISOStringFromModelValue}
@@ -304,7 +306,9 @@ sap.ui.define([
 	 * @ui5-restricted sap.fe, sap.suite.ui.generic.template, sap.ui.comp, sap.ui.generic
 	 */
 	TimeOfDay.prototype.getModelValueFromISOString = function (sISOString) {
-		return sISOString ? sISOString : null;
+		return sISOString
+			? this.getModelFormat().format(UI5Date.getInstance("1970-01-01T" + sISOString + "Z"))
+			: null;
 	};
 
 	/**

package/src/sap/ui/model/odata/type/Unit.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

package/src/sap/ui/model/odata/v2/Context.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive,
@@ -99,13 +99,17 @@ sap.ui.define([
 				this.fnStartActivation = undefined;
 				// the promise on activation start of this context
 				this.oStartActivationPromise = bInactive
-					? new SyncPromise(function (resolve) { that.fnStartActivation = resolve; })
+					? new SyncPromise(function (resolve) {
+						that.fnStartActivation = resolve;
+					})
 					: SyncPromise.resolve();
 				// the function to activate this context
 				this.fnActivate = undefined;
 				// the promise on activation of this context
 				this.oActivatedPromise = bInactive
-					? new SyncPromise(function (resolve) { that.fnActivate = resolve; })
+					? new SyncPromise(function (resolve) {
+						that.fnActivate = resolve;
+					})
 					: SyncPromise.resolve();
 				// for a transient context, maps navigation property name to (array of)
 				// sub-context(s) for deep create
@@ -142,7 +146,9 @@ sap.ui.define([
 	Context.prototype.cancelActivation = function () {
 		var that = this;
 
-		this.oStartActivationPromise = new SyncPromise(function (resolve) { that.fnStartActivation = resolve; });
+		this.oStartActivationPromise = new SyncPromise(function (resolve) {
+			that.fnStartActivation = resolve;
+		});
 	};
 
 	/**
@@ -257,7 +263,9 @@ sap.ui.define([
 					context : that,
 					error : reject,
 					groupId : oGroupInfo.groupId,
-					success : function () {resolve();}
+					success : function () {
+						resolve();
+					}
 				}, mParameters));
 		});
 	};

package/src/sap/ui/model/odata/v2/ODataAnnotations.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class Annotation loader for OData V2 services
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @public
 	 * @since 1.37.0

package/src/sap/ui/model/odata/v2/ODataListBinding.js

@@ -102,10 +102,8 @@ sap.ui.define([
 
 			this.sFilterParams = null;
 			this.sSortParams = null;
-			this.sRangeParams = null;
 			this.sCustomParams = this.oModel.createCustomParams(this.mParameters);
 			this.mCustomParams = mParameters && mParameters.custom;
-			this.iStartIndex = 0;
 			this.iLength = 0;
 			this.bPendingChange = false;
 			this.aAllKeys = null;
@@ -277,6 +275,21 @@ sap.ui.define([
 		return aContexts;
 	};
 
+	/**
+	 * Returns the context at the given index.
+	 *
+	 * @param {number} iIndex The index of the context
+	 *
+	 * @returns {sap.ui.model.odata.v2.Context|undefined}
+	 *   The context at the given index or <code>undefined</code> if no context exists at the given index
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.table
+	 */
+	ODataListBinding.prototype.getContextByIndex = function (iIndex) {
+		return this._getContexts(iIndex, 1)[0];
+	};
+
 	/**
 	 * Return contexts for the list.
 	 *
@@ -777,49 +790,52 @@ sap.ui.define([
 	/**
 	 * Load data for the given range from server.
 	 *
-	 * @param {int} iStartIndex The start index
-	 * @param {int} iLength The amount of data to be requested
+	 * @param {int} [iStartIndex] The start index
+	 * @param {int} [iLength] The amount of data to be requested
 	 * @private
 	 */
 	ODataListBinding.prototype.loadData = function(iStartIndex, iLength) {
-		var sGroupId,
+		var sGroupId, oReadParameters,
 			sGuid = uid(),
 			bInlineCountRequested = false,
-			aParams = [],
+			iLimit = this.oModel.iSizeLimit,
 			sPath = this.sPath,
 			bRemovePersistedCreatedAfterRefresh = this.bRemovePersistedCreatedAfterRefresh,
+			aResultPages = [],
+			bUseClientMode = this.useClientMode(),
 			that = this;
 
-		// create range parameters and store start index for sort/filter requests
-		if (iStartIndex || iLength) {
-			this.sRangeParams = "$skip=" + iStartIndex + "&$top=" + iLength;
-			this.iStartIndex = iStartIndex;
-		} else {
-			iStartIndex = this.iStartIndex;
-		}
+		function getUrlParameters() {
+			var aParameters = [];
+			// create range parameters and store start index for sort/filter requests
+			if (iLength) {
+				aParameters.push("$skip=" + iStartIndex + "&$top=" + iLength);
+			} else {
+				// For OperationMode.Client and OperationMode.Auto (if the threshold was sufficient)
+				// loadData is called without iStartIndex and iLength, try reading all data without
+				// $skip and $top
+				iStartIndex = 0;
+			}
+			if (that.sSortParams) {
+				aParameters.push(that.sSortParams);
+			}
+			that._addFilterQueryOption(aParameters, !bUseClientMode);
+			if (that.sCustomParams) {
+				aParameters.push(that.sCustomParams);
+			}
+			if (that.sCountMode == CountMode.InlineRepeat
+					|| !that.bLengthFinal
+						&& (that.sCountMode === CountMode.Inline || that.sCountMode === CountMode.Both)) {
+				aParameters.push("$inlinecount=allpages");
+				bInlineCountRequested = true;
+			} else {
+				bInlineCountRequested = false;
+			}
 
-		// create the request url
-		// $skip/$top and are excluded for OperationMode.Client and Auto if the threshold was sufficient
-		if (this.sRangeParams && !this.useClientMode()) {
-			aParams.push(this.sRangeParams);
-		}
-		if (this.sSortParams) {
-			aParams.push(this.sSortParams);
-		}
-		this._addFilterQueryOption(aParams, !this.useClientMode());
-		if (this.sCustomParams) {
-			aParams.push(this.sCustomParams);
-		}
-		if (this.sCountMode == CountMode.InlineRepeat ||
-			!this.bLengthFinal &&
-			(this.sCountMode === CountMode.Inline ||
-			 this.sCountMode === CountMode.Both)) {
-			aParams.push("$inlinecount=allpages");
-			bInlineCountRequested = true;
+			return aParameters;
 		}
 
 		function fnSuccess(oData) {
-
 			// update iLength (only when the inline count was requested and is available)
 			if (bInlineCountRequested && oData.__count !== undefined) {
 				that.iLength = parseInt(oData.__count);
@@ -847,12 +863,24 @@ sap.ui.define([
 				}
 			}
 
-			if (that.useClientMode()) {
+			if (bUseClientMode) {
 				// For clients mode, store all keys separately and set length to final
-				that.aKeys = [];
+				if (!iStartIndex) {
+					that.aKeys = [];
+				}
 				each(oData.results, function(i, entry) {
-					that.aKeys[i] = that.oModel._getKey(entry);
+					that.aKeys[iStartIndex + i] = that.oModel._getKey(entry);
 				});
+				aResultPages.push(oData.results);
+				if (oData.__next && that.aKeys.length < iLimit /*first request may return enough*/) {
+					// continue reading
+					iStartIndex = that.aKeys.length;
+					iLength = iLimit - iStartIndex; // read up to model size limit
+					oReadParameters.urlParameters = getUrlParameters();
+					that.mRequestHandles[sGuid] = that.oModel.read(that.sPath, oReadParameters);
+
+					return;
+				}
 				that.updateExpandedList(that.aKeys);
 				that.aAllKeys = that.aKeys.slice();
 				that.iLength = that.aKeys.length;
@@ -913,9 +941,17 @@ sap.ui.define([
 				that._removePersistedCreatedContexts();
 			}
 
-			//register datareceived call as  callAfterUpdate
-			that.oModel.callAfterUpdate(function() {
-				that.fireDataReceived({data: oData});
+			that.oModel.callAfterUpdate(function () {
+				if (aResultPages.length > 1) {
+					that.fireDataReceived({
+						data: {
+							__count: String(that.iLength),
+							results: Array.prototype.concat.apply([], aResultPages)
+						}
+					});
+				} else {
+					that.fireDataReceived({data: oData});
+				}
 			});
 		}
 
@@ -942,13 +978,11 @@ sap.ui.define([
 			if (!that.bSkipDataEvents) {
 				that.fireDataReceived();
 			}
-
 		}
 
 		if (this.isRelative()){
 			sPath = this.getResolvedPath();
 		}
-
 		if (sPath) {
 			// Execute the request and use the metadata if available
 			this.bPendingRequest = true;
@@ -958,20 +992,20 @@ sap.ui.define([
 			this.bSkipDataEvents = false;
 			//if load is triggered by a refresh we have to check the refreshGroup
 			sGroupId = this.sRefreshGroupId ? this.sRefreshGroupId : this.sGroupId;
-			this.mRequestHandles[sGuid] = this.oModel.read(this.sPath, {
+			oReadParameters = {
 				headers: this.bTransitionMessagesOnly
 					? {"sap-messages" : "transientOnly"}
 					: undefined,
 				context: this.oContext,
 				groupId: sGroupId,
-				urlParameters: aParams,
+				urlParameters: getUrlParameters(),
 				success: fnSuccess,
 				error: fnError,
 				canonicalRequest: this.bCanonicalRequest,
 				updateAggregatedMessages: this.bRefresh
-			});
+			};
+			this.mRequestHandles[sGuid] = this.oModel.read(this.sPath, oReadParameters);
 		}
-
 	};
 
 	ODataListBinding.prototype.isLengthFinal = function() {
@@ -1722,7 +1756,7 @@ sap.ui.define([
 		if (!this.aApplicationFilters || !Array.isArray(this.aApplicationFilters)) {
 			this.aApplicationFilters = [];
 		}
-
+		/** @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter.js */
 		this.convertFilters();
 		this.oCombinedFilter = FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
 
@@ -1770,6 +1804,7 @@ sap.ui.define([
 	/**
 	 * Convert sap.ui.model.odata.Filter to sap.ui.model.Filter
 	 *
+	 * @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter.js
 	 * @private
 	 */
 	ODataListBinding.prototype.convertFilters = function() {
@@ -1808,6 +1843,7 @@ sap.ui.define([
 		this.addComparators(this.aSorters, true);
 		this.addComparators(this.aFilters);
 		this.addComparators(this.aApplicationFilters);
+		/** @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter.js */
 		this.convertFilters();
 		this.oCombinedFilter = FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
 
@@ -2043,18 +2079,24 @@ sap.ui.define([
 			sResolvedPath = this.getResolvedPath(),
 			that = this;
 
+		function isNonTransientTarget(sFullTarget) {
+			return aCreatedContextDeepPaths
+				.every((sCreatedContextDeepPath) => !sFullTarget.startsWith(sCreatedContextDeepPath));
+		}
+
 		if (!sResolvedPath) {
 			return Promise.resolve(null);
 		}
 
+		const aCreatedContextDeepPaths = this._getCreatedContexts()
+			.map((oCreatedContext) => oCreatedContext.getDeepPath());
 		this.oModel.getMessagesByPath(sDeepPath, true).forEach(function (oMessage) {
 			var sPredicate;
 
 			if (!fnFilter || fnFilter(oMessage)) {
-				// this.oModel.getMessagesByPath returns only messages with full target starting with
-				// deep path
+				// this.oModel.getMessagesByPath returns only messages with full target starting with deep path
 				oMessage.aFullTargets.forEach(function (sFullTarget) {
-					if (sFullTarget.startsWith(sDeepPath)) {
+					if (sFullTarget.startsWith(sDeepPath) && isNonTransientTarget(sFullTarget)) {
 						sPredicate = sFullTarget.slice(sDeepPath.length).split("/")[0];
 						if (sPredicate) {
 							aPredicateSet.add(sPredicate);
@@ -2128,10 +2170,15 @@ sap.ui.define([
 			bFirstCreateAtStart = this.isFirstCreateAtEnd() === false,
 			aKeys = bFirstCreateAtStart && this.aKeys.length
 				? aCreatedContexts.concat(this.aKeys)
-				: this.aKeys;
+				: this.aKeys,
+			iLimit = this.bLengthFinal ? this.iLength : undefined;
+
+		if (bFirstCreateAtStart && iLimit) {
+			// when adding the created contexts to aKeys the final length has to be increased too
+			iLimit += aCreatedContexts.length;
+		}
 
-		aIntervals = ODataUtils._getReadIntervals(aKeys, iStartIndex, iLength, iMaximumPrefetchSize,
-			/*iLimit*/this.bLengthFinal ? this.iLength : undefined);
+		aIntervals = ODataUtils._getReadIntervals(aKeys, iStartIndex, iLength, iMaximumPrefetchSize, iLimit);
 		oInterval = ODataUtils._mergeIntervals(aIntervals);
 
 		if (oInterval && bFirstCreateAtStart && this.aKeys.length) {
@@ -2275,14 +2322,16 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataListBinding.prototype.fireCreateActivate = function (oContext) {
-		if (this.fireEvent("createActivate", {context : oContext}, /*bAllowPreventDefault*/true)) {
-			oContext.finishActivation();
-			this._fireChange({reason : ChangeReason.Change});
-		} else {
-			oContext.cancelActivation();
-			oContext.fetchActivationStarted()
-				.then(this.fireCreateActivate.bind(this, oContext))
-				.catch(this.oModel.getReporter(sClassName));
+		if (!this.bIsBeingDestroyed) {
+			if (this.fireEvent("createActivate", {context : oContext}, /*bAllowPreventDefault*/true)) {
+				oContext.finishActivation();
+				this._fireChange({reason : ChangeReason.Change});
+			} else {
+				oContext.cancelActivation();
+				oContext.fetchActivationStarted()
+					.then(this.fireCreateActivate.bind(this, oContext))
+					.catch(this.oModel.getReporter(sClassName));
+			}
 		}
 	};