after merging, inspecting, fixing, tbc.

1 files changed, 1 insertions, 16 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index 5e9d50221..a361d5f67 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -1,6 +1,5 @@
 package at.gv.egovernment.moa.id.protocols.stork2;
 
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.moduls.IAction;
@@ -105,20 +104,6 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
             authnRequest = authnEngine.validateSTORKAuthnRequest(decSamlToken);
         } catch (STORKSAMLEngineException ex) {
             Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
-<<<<<<< HEAD
-        }  catch (ClassCastException e) {
-            Logger.error("Could not extract authenticaiton request");
-        }
-
-
-        // check if a valid attr request is containerd
-        try {
-            attrRequest = attrEngine.validateSTORKAttrQueryRequest(decSamlToken);
-        } catch (STORKSAMLEngineException ex) {
-            Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
-        } catch (ClassCastException e) {
-            Logger.error("Could not extract attribute request");
-=======
         } catch(ClassCastException e) {
         	// we do not have a authnRequest
         	// check if a valid attr request is container
@@ -127,8 +112,8 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
         	} catch (STORKSAMLEngineException ex) {
         		Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
         	}
->>>>>>> origin/bs_3_fr
         }
+
         // if there is no authn or attr request, raise error
         if ((authnRequest == null) && (attrRequest == null)) {
             Logger.error("There is no authentication or attribute request contained.");