From 3470240ef052975ac0e78c010850e8ff597bafb2 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Thu, 1 Jul 2021 11:27:59 +0200 Subject: [PATCH 1/2] Allow null attribute value in Model.set() See gh-27115 --- .../src/main/kotlin/org/springframework/ui/ModelExtensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-context/src/main/kotlin/org/springframework/ui/ModelExtensions.kt b/spring-context/src/main/kotlin/org/springframework/ui/ModelExtensions.kt index 22ee0c626e..585f1f9949 100644 --- a/spring-context/src/main/kotlin/org/springframework/ui/ModelExtensions.kt +++ b/spring-context/src/main/kotlin/org/springframework/ui/ModelExtensions.kt @@ -26,6 +26,6 @@ package org.springframework.ui * @author Mario Arias * @since 5.0 */ -operator fun Model.set(attributeName: String, attributeValue: Any) { +operator fun Model.set(attributeName: String, attributeValue: Any?) { this.addAttribute(attributeName, attributeValue) } From 7231f22c231c5939419b378f787510874723a7b5 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 26 Aug 2023 16:39:25 +0200 Subject: [PATCH 2/2] Update copyright of changed file See gh-27115 --- .../src/main/kotlin/org/springframework/ui/ModelExtensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-context/src/main/kotlin/org/springframework/ui/ModelExtensions.kt b/spring-context/src/main/kotlin/org/springframework/ui/ModelExtensions.kt index 585f1f9949..6da1464d8f 100644 --- a/spring-context/src/main/kotlin/org/springframework/ui/ModelExtensions.kt +++ b/spring-context/src/main/kotlin/org/springframework/ui/ModelExtensions.kt @@ -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"); * you may not use this file except in compliance with the License.