Skip to content

Commit

Permalink
Get config store from Engine not subsystem engine in TPSProcessor
Browse files Browse the repository at this point in the history
This fixes the outstanding issue where various config is erroneously
prefixed with TPS

Resolves #1960743
  • Loading branch information
ckelleyRH committed Sep 30, 2021
1 parent 7bd67c3 commit cda0d54
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.dogtagpki.server.authentication.AuthManager;
import org.dogtagpki.server.authentication.AuthManagersConfig;
import org.dogtagpki.server.authentication.AuthenticationConfig;
import org.dogtagpki.server.tps.TPSEngineConfig;
import org.dogtagpki.server.tps.TPSSession;
import org.dogtagpki.server.tps.TPSSubsystem;
import org.dogtagpki.server.tps.authentication.AuthUIParameter;
Expand Down Expand Up @@ -95,7 +96,6 @@
import com.netscape.certsrv.authentication.IAuthToken;
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.EPropertyNotFound;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.common.Constants;
import com.netscape.certsrv.dbs.EDBRecordNotFoundException;
import com.netscape.certsrv.logging.AuditEvent;
Expand Down Expand Up @@ -1542,8 +1542,7 @@ protected void fillTokenRecordDefaultPolicy(TokenRecord tokenRecord) throws TPSE

try {
org.dogtagpki.server.tps.TPSEngine engine = org.dogtagpki.server.tps.TPSEngine.getInstance();
TPSSubsystem subsystem = (TPSSubsystem) engine.getSubsystem(TPSSubsystem.ID);
IConfigStore configStore = subsystem.getConfigStore();
TPSEngineConfig configStore = engine.getConfig();

String config = "tokendb.defaultPolicy";
String defaultPolicy = configStore.getString(config);
Expand Down

0 comments on commit cda0d54

Please sign in to comment.