From 1f9903e65b4469537f8aea7e2c4d302a5f7f8233 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Wed, 8 Dec 2021 08:48:58 +0100
Subject: [PATCH] Fix merge

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java | 1 +
 impl/src/main/java/org/eclipse/parsson/api/JsonConfig.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java b/impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java
index 3c796688..57af12cd 100644
--- a/impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java
+++ b/impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java
@@ -289,6 +289,7 @@ public JsonNumber createValue(Number value) {
     private void addKnowProperty(Map<String, Object> providerConfig, Map<String, ?> config, String property) {
         if (config.containsKey(property)) {
             providerConfig.put(property, config.get(property));
+        }
     }
 
     static boolean isPrettyPrintingEnabled(Map<String, ?> config) {
diff --git a/impl/src/main/java/org/eclipse/parsson/api/JsonConfig.java b/impl/src/main/java/org/eclipse/parsson/api/JsonConfig.java
index 21432dd6..6bacf6e3 100644
--- a/impl/src/main/java/org/eclipse/parsson/api/JsonConfig.java
+++ b/impl/src/main/java/org/eclipse/parsson/api/JsonConfig.java
@@ -21,7 +21,7 @@ public interface JsonConfig {
      * Configuration property to reject duplicate keys. The value of the property could be
      * be anything.
      
-     * @deprecated in favor of {@link jakarta.json.JsonConfig#IGNORE_NULL}
+     * @deprecated in favor of {@link jakarta.json.JsonConfig#KEY_STRATEGY}
      */
     @Deprecated
     String REJECT_DUPLICATE_KEYS = "org.eclipse.parsson.rejectDuplicateKeys";