Merge pull request #27115 from gnagy

* pr/27115:
  Update copyright of changed file
  Allow null attribute value in Model.set()

Closes gh-27115
This commit is contained in:
Stephane Nicoll 2023-08-26 16:41:04 +02:00
commit ca14202d78
1 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors * Copyright 2002-2023 the original author or authors
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,6 +26,6 @@ package org.springframework.ui
* @author Mario Arias * @author Mario Arias
* @since 5.0 * @since 5.0
*/ */
operator fun Model.set(attributeName: String, attributeValue: Any) { operator fun Model.set(attributeName: String, attributeValue: Any?) {
this.addAttribute(attributeName, attributeValue) this.addAttribute(attributeName, attributeValue)
} }