From 1bc62891e75a5e97abefaca3b60923977fe417b1 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Jun 2013 13:03:24 +0000
Subject: [PATCH] OPENDJ-960 (CR-1844) HTTP Connection Handler - Validate http-config.json file
---
opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
index 33dc0dc..e96d88d 100644
--- a/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
+++ b/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
@@ -875,12 +875,13 @@
final String... urlPatterns) throws Exception
{
// parse and use JSON config
+ File jsonConfigFile = getFileForPath(this.currentConfig.getConfigFile());
final JsonValue configuration =
- parseJsonConfiguration(getFileForPath(this.currentConfig
- .getConfigFile()));
+ parseJsonConfiguration(jsonConfigFile).recordKeyAccesses();
final HTTPAuthenticationConfig authenticationConfig =
getAuthenticationConfig(configuration);
final ConnectionFactory connFactory = getConnectionFactory(configuration);
+ configuration.verifyAllKeysAccessed();
Filter filter =
new CollectClientConnectionsFilter(this, authenticationConfig);
--
Gitblit v1.10.0