aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-12-15 09:50:18 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-12-15 09:50:18 +0100
commit3573f8ea5a4b269834723da4708bf0bace50fa65 (patch)
tree8fb47341f59a7bef99cb0c7370d16db0210b2e95 /id/server/idserverlib/src/main
parent0f4c4e1e8c897d06a4ba4aeea9657e4036ead50d (diff)
parentf03d5eb61c46186cf9d9e5a27f67fd8ac070a296 (diff)
downloadmoa-id-spss-3573f8ea5a4b269834723da4708bf0bace50fa65.tar.gz
moa-id-spss-3573f8ea5a4b269834723da4708bf0bace50fa65.tar.bz2
moa-id-spss-3573f8ea5a4b269834723da4708bf0bace50fa65.zip
Merge branch 'eIDAS_node_implementation' into development_preview
Diffstat (limited to 'id/server/idserverlib/src/main')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
index 77cc7228b..df4866c30 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
@@ -41,7 +41,7 @@ import at.gv.egovernment.moa.util.MiscUtil;
public abstract class AbstractCredentialProvider {
- private static KeyStore keyStore = null;
+ private KeyStore keyStore = null;
/**
* Get a friendlyName for this keyStore implementation