diff options
| author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-27 17:24:46 +0100 | 
|---|---|---|
| committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-29 14:04:08 +0100 | 
| commit | 09266016cbcb143d7b6e65d32b49b6b3d2cb53c0 (patch) | |
| tree | b6e19b40432ff3d6da11a2f56f0b11d4675b00d8 /id/ConfigWebTool | |
| parent | fdcc7df81a159284d6bcfcd94be28c6f08afc5e4 (diff) | |
| download | moa-id-spss-09266016cbcb143d7b6e65d32b49b6b3d2cb53c0.tar.gz moa-id-spss-09266016cbcb143d7b6e65d32b49b6b3d2cb53c0.tar.bz2 moa-id-spss-09266016cbcb143d7b6e65d32b49b6b3d2cb53c0.zip | |
fixed issues after merge
Diffstat (limited to 'id/ConfigWebTool')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java | 7 | 
1 files changed, 0 insertions, 7 deletions
| diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java index ca027e578..b3788c26d 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java @@ -102,7 +102,6 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,  	private OASAML1Config saml1OA = new OASAML1Config();  	private OASSOConfig ssoOA = new OASSOConfig();  	private OAOAuth20Config oauth20OA = new OAOAuth20Config(); -	private OASTORKConfig storkOA;  	private OASTORKConfig storkOA = new OASTORKConfig();  	private FormularCustomization formOA = new FormularCustomization(); @@ -930,12 +929,6 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,  		sso.setSingleLogOutURL(ssoOA.getSingleLogOutURL()); -		STORK stork = authoa.getSTORK(); -		if (stork == null) { -			// TODO: make stork configurable -			 -		} -		  		if (oauth20OA != null) {  			log.debug("Saving OAuth 2.0 configuration:");  			OAOAUTH20 oaOAuth20 = authoa.getOAOAUTH20(); | 
