This is an automated email from the ASF dual-hosted git repository.
style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 597d61d6e - Fixed an issue with missed config keys while iterating
through them on Scala 2.13.x (#5440)
597d61d6e is described below
commit 597d61d6eef974b25e5cdc6e1c284f9867429170
Author: Yevhen Sentiabov <[email protected]>
AuthorDate: Tue Nov 14 14:25:00 2023 -0600
- Fixed an issue with missed config keys while iterating through them on
Scala 2.13.x (#5440)
---
.../scala/src/main/scala/org/apache/openwhisk/common/Config.scala | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/common/Config.scala
b/common/scala/src/main/scala/org/apache/openwhisk/common/Config.scala
index 91d5e6577..d66b2b5d7 100644
--- a/common/scala/src/main/scala/org/apache/openwhisk/common/Config.scala
+++ b/common/scala/src/main/scala/org/apache/openwhisk/common/Config.scala
@@ -141,8 +141,9 @@ object Config {
*/
def readPropertiesFromSystemAndEnv(properties:
scala.collection.mutable.Map[String, String],
env: Map[String, String])(implicit
logging: Logging) = {
+ val keys: Seq[String] = properties.keys.toSeq
readPropertiesFromSystem(properties)
- for (p <- properties.keys) {
+ for (p <- keys) {
val envp = p.replace('.', '_').toUpperCase
val envv = env.get(envp)
if (envv.isDefined) {
@@ -153,7 +154,8 @@ object Config {
}
def readPropertiesFromSystem(properties:
scala.collection.mutable.Map[String, String])(implicit logging: Logging) = {
- for (p <- properties.keys) {
+ val keys: Seq[String] = properties.keys.toSeq
+ for (p <- keys) {
val sysv = Option(System.getProperty(prefix + p))
if (sysv.isDefined) {
logging.info(this, s"system set value for $p")
