Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[LOGMGR-279] Retrieve the handler reference before it may be potentia… #317

Merged
merged 1 commit into from Jun 23, 2020
Merged

[LOGMGR-279] Retrieve the handler reference before it may be potentia… #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/org/jboss/logmanager/config/HandlerConfigurationImpl.java
View file
Open in desktop
Expand Up @@ -375,19 +375,20 @@ public boolean removeHandlerName(final String name) {
}
final int index = handlerNames.indexOf(name);
handlerNames.remove(index);
configuration.addAction(new ConfigAction<Void>() {
public Void validate() throws IllegalArgumentException {
return null;
configuration.addAction(new ConfigAction<Handler>() {
public Handler validate() throws IllegalArgumentException {
final Map<String, Handler> handlerRefs = configuration.getHandlerRefs();
return handlerRefs.get(name);
}

public void applyPreCreate(final Void param) {
public void applyPreCreate(final Handler param) {
addPostConfigurationActions();
}

public void applyPostCreate(final Void param) {
public void applyPostCreate(final Handler param) {
final Map<String, Handler> handlerRefs = configuration.getHandlerRefs();
final ExtHandler handler = (ExtHandler) handlerRefs.get(getName());
handler.removeHandler(handlerRefs.get(name));
handler.removeHandler(param);
}

public void rollback() {
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/org/jboss/logmanager/config/LoggerConfigurationImpl.java
View file
Open in desktop
Expand Up @@ -310,19 +310,19 @@ public boolean removeHandlerName(final String name) {
}
final int index = handlerNames.indexOf(name);
handlerNames.remove(index);
configuration.addAction(new ConfigAction<Void>() {
public Void validate() throws IllegalArgumentException {
return null;
configuration.addAction(new ConfigAction<Handler>() {
public Handler validate() throws IllegalArgumentException {
final Map<String, Handler> handlerRefs = configuration.getHandlerRefs();
return handlerRefs.get(name);
}

public void applyPreCreate(final Void param) {
public void applyPreCreate(final Handler param) {
}

public void applyPostCreate(final Void param) {
final Map<String, Handler> handlerRefs = configuration.getHandlerRefs();
public void applyPostCreate(final Handler param) {
final Map<String, Logger> loggerRefs = configuration.getLoggerRefs();
final Logger logger = (Logger) loggerRefs.get(getName());
logger.removeHandler(handlerRefs.get(name));
final Logger logger = loggerRefs.get(getName());
logger.removeHandler(param);
}

public void rollback() {
Expand Down