1 files changed, 15 insertions, 18 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/TrustEngineFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/TrustEngineFactory.java
index 60de84161..f3c5ed86a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/TrustEngineFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/TrustEngineFactory.java
@@ -26,7 +26,7 @@ public class TrustEngineFactory {
 	public static SignatureTrustEngine getSignatureTrustEngine() {
 		try {
 			MetadataPKIXValidationInformationResolver mdResolver = new MetadataPKIXValidationInformationResolver(
-					new MOAMetadataProvider());
+					MOAMetadataProvider.getInstance());
 
 			List<KeyInfoProvider> keyInfoProvider = new ArrayList<KeyInfoProvider>();
 			keyInfoProvider.add(new DSAKeyValueProvider());
@@ -49,26 +49,23 @@ public class TrustEngineFactory {
 
 	public static SignatureTrustEngine getSignatureKnownKeysTrustEngine() {
 		MetadataCredentialResolver resolver;
-		try {
-			resolver = new MetadataCredentialResolver(new MOAMetadataProvider());
 
-			List<KeyInfoProvider> keyInfoProvider = new ArrayList<KeyInfoProvider>();
-			keyInfoProvider.add(new DSAKeyValueProvider());
-			keyInfoProvider.add(new RSAKeyValueProvider());
-			keyInfoProvider.add(new InlineX509DataProvider());
+		resolver = new MetadataCredentialResolver(
+				MOAMetadataProvider.getInstance());
 
-			KeyInfoCredentialResolver keyInfoResolver = new BasicProviderKeyInfoCredentialResolver(
-					keyInfoProvider);
+		List<KeyInfoProvider> keyInfoProvider = new ArrayList<KeyInfoProvider>();
+		keyInfoProvider.add(new DSAKeyValueProvider());
+		keyInfoProvider.add(new RSAKeyValueProvider());
+		keyInfoProvider.add(new InlineX509DataProvider());
 
-			ExplicitKeySignatureTrustEngine engine = new ExplicitKeySignatureTrustEngine(
-					resolver, keyInfoResolver);
+		KeyInfoCredentialResolver keyInfoResolver = new BasicProviderKeyInfoCredentialResolver(
+				keyInfoProvider);
+
+		ExplicitKeySignatureTrustEngine engine = new ExplicitKeySignatureTrustEngine(
+				resolver, keyInfoResolver);
+
+		return engine;
 
-			return engine;
-		} catch (MetadataProviderException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return null;
-		}
 	}
-	
+
 }