mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
22.33.2013 90809948a377234acbeed1005733cea9b55208e0
refs
author Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Wednesday, May 22, 2013 12:33 +0200
committer Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Wednesday, May 22, 2013 12:33 +0200
commit90809948a377234acbeed1005733cea9b55208e0
tree 7f6829ad9c7e298f4f96daabb3cc0eae8ff8b9f7 tree | zip | gz
parent 16595a8882699b39b38bca901a12b30357625d3d view | diff
OPENDJ-918 (CR-1723) - HTTP Connection Handler - Server cannot start with horked http-config.json


Protected the HTTP Connection Handler against a failing initialization: after two consecutive startup failures, the HTTP connection handler will be disabled, errors will be logged and alerts will be output.


HTTPConnectionHandler.java:
Added instance member enabled to decouple the enable/disable state from the config.
Implemented getAlerts() method.
In startHttpServer(), moved the try / catch block and the call to notify() to the run() method.
In run(), handle failing initialization.
In stopHttpServer(), added a null check in case of failed intitialization.
Extracted method cleanUpHttpServer().

ServerConstants.java:
Added alerts for HTTP connection handler.

protocol*.properties:
Modified the name of the LDAP specific properties to be more generic.

LDAPConnectionHandler.java
Consequence of the change to protocol.properties.
11 files modified
286 ■■■■■ changed files
opendj-sdk/opends/src/messages/messages/protocol.properties 12 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/messages/messages/protocol_de.properties 4 ●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/messages/messages/protocol_es.properties 4 ●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/messages/messages/protocol_fr.properties 4 ●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/messages/messages/protocol_ja.properties 2 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/messages/messages/protocol_ko.properties 2 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/messages/messages/protocol_zh_CN.properties 2 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/messages/messages/protocol_zh_TW.properties 2 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java 229 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java 6 ●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java 19 ●●●●● diff | view | raw | blame | history