diff options
| author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-15 17:04:02 +0100 |
|---|---|---|
| committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-27 16:37:39 +0100 |
| commit | 8276884b9c45315df5fa951ce53b3d35f4983b22 (patch) | |
| tree | ed36f7e05f5b7b7c79a7199fc54d2911dfd2bb86 | |
| parent | ae5214a3fdafeb1a859287f96f657783187e57d6 (diff) | |
| download | moa-id-spss-8276884b9c45315df5fa951ce53b3d35f4983b22.tar.gz moa-id-spss-8276884b9c45315df5fa951ce53b3d35f4983b22.tar.bz2 moa-id-spss-8276884b9c45315df5fa951ce53b3d35f4983b22.zip | |
fix load stork config from database
| -rw-r--r-- | .settings/org.eclipse.jdt.core.prefs | 7 | ||||
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java | 10 |
2 files changed, 3 insertions, 14 deletions
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 638b39a15..000000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -#Thu Jan 03 11:06:02 CET 2013
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java index aa97c548a..8de47f5f6 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java @@ -430,12 +430,8 @@ public class AuthConfigurationProvider extends ConfigurationProvider { ForeignIdentities foreign = auth.getForeignIdentities(); if (foreign == null ) { Logger.warn("Error in MOA-ID Configuration. No STORK configuration found."); - - } - //TODO: commented because npe was thrown - //else - //storkconfig = new STORKConfig(foreign.getSTORK(), props, rootConfigFileDir); - + } else + storkconfig = new STORKConfig(foreign.getSTORK(), props, rootConfigFileDir); //load Chaining modes ChainingModes cm = moaidconfig.getChainingModes(); @@ -1007,4 +1003,4 @@ public class AuthConfigurationProvider extends ConfigurationProvider { return moasp; } -}
\ No newline at end of file +} |