Merge pull request #12261 from npamudika/master

Fix NPE in JWKS endpoint
wso2 · Feb 13, 2024 · d7a6a0f · d7a6a0f
2 parents 13b6312 + 78833d8
commit d7a6a0f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.../org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java b/.../org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
@@ -6852,11 +6852,13 @@ public static void logAuditMessage(String entityType, String entityInfo, String
         jsonObject.put("typ", entityType);
         jsonObject.put("action", action);
         jsonObject.put("performedBy", performedBy);
-        try {
-            JSONObject entityInfoJson = (JSONObject) new JSONParser().parse(entityInfo);
-            jsonObject.put("info", entityInfoJson);
-        } catch (ParseException ignored) { // if entityInfo cannot be parsed as json, log as a simple string
-            jsonObject.put("info", entityInfo);
+        if (entityInfo != null && !StringUtils.isBlank(entityInfo)) {
+            try {
+                JSONObject entityInfoJson = (JSONObject) new JSONParser().parse(entityInfo);
+                jsonObject.put("info", entityInfoJson);
+            } catch (ParseException ignored) { // if entityInfo cannot be parsed as json, log as a simple string
+                jsonObject.put("info", entityInfo);
+            }
         }
         audit.info(StringEscapeUtils.unescapeJava(jsonObject.toString()));
     }