1 files changed, 31 insertions, 7 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java
index ee0eee0a..7a363455 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java
@@ -1,4 +1,28 @@
 /*******************************************************************************
+ * Copyright 2017 Graz University of Technology
+ * EAAF-Core Components has been developed in a cooperation between EGIZ,  
+ * A-SIT+, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+/*******************************************************************************
+ *******************************************************************************/
+/*******************************************************************************
  *******************************************************************************/
 package at.gv.egiz.eaaf.modules.pvp2.idp.impl;
 
@@ -237,7 +261,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon
 			if (pendingReq != null)
 				revisionsLogger.logEvent(pendingReq, EventConstants.TRANSACTION_ERROR, pendingReq.getUniqueTransactionIdentifier());
 			
-			throw new InvalidProtocolRequestException("pvp2.21", new Object[] {}, e.getMessage());
+			throw new InvalidProtocolRequestException("pvp2.21", new Object[] {});
 			
 		} catch (SecurityException e) {
 			String samlRequest = req.getParameter("SAMLRequest");			
@@ -247,7 +271,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon
 			if (pendingReq != null)
 				revisionsLogger.logEvent(pendingReq, EventConstants.TRANSACTION_ERROR, pendingReq.getUniqueTransactionIdentifier());
 			
-			throw new InvalidProtocolRequestException("pvp2.22", new Object[] {e.getMessage()}, e.getMessage());
+			throw new InvalidProtocolRequestException("pvp2.22", new Object[] {e.getMessage()});
 		
 		} catch (EAAFException e) {
 			
@@ -265,7 +289,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon
 			if (pendingReq != null)
 				revisionsLogger.logEvent(pendingReq, EventConstants.TRANSACTION_ERROR, pendingReq.getUniqueTransactionIdentifier());
 			
-			throw new EAAFException("pvp2.24", new Object[] {e.getMessage()}, e.getMessage(), e);
+			throw new EAAFException("pvp2.24", new Object[] {e.getMessage()}, e);
 		}					
 	}
 	
@@ -302,7 +326,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon
 			if (pendingReq != null)
 				revisionsLogger.logEvent(pendingReq, EventConstants.TRANSACTION_ERROR, pendingReq.getUniqueTransactionIdentifier());
 			
-			throw new InvalidProtocolRequestException("pvp2.21", new Object[] {}, e.getMessage());
+			throw new InvalidProtocolRequestException("pvp2.21", new Object[] {});
 			
 		} catch (SecurityException e) {
 			String samlRequest = req.getParameter("SAMLRequest");			
@@ -312,7 +336,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon
 			if (pendingReq != null)
 				revisionsLogger.logEvent(pendingReq, EventConstants.TRANSACTION_ERROR, pendingReq.getUniqueTransactionIdentifier());
 			
-			throw new InvalidProtocolRequestException("pvp2.22", new Object[] {e.getMessage()}, e.getMessage());
+			throw new InvalidProtocolRequestException("pvp2.22", new Object[] {e.getMessage()});
 			
 		} catch (EAAFException e) {
 			String samlRequest = req.getParameter("SAMLRequest");			
@@ -332,7 +356,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon
 			if (pendingReq != null)
 				revisionsLogger.logEvent(pendingReq, EventConstants.TRANSACTION_ERROR, pendingReq.getUniqueTransactionIdentifier());
 						
-			throw new EAAFException("pvp2.24", new Object[] {e.getMessage()}, e.getMessage(), e);
+			throw new EAAFException("pvp2.24", new Object[] {e.getMessage()}, e);
 		}					
 	}
 	
@@ -356,7 +380,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon
 			InboundMessage msg = pendingReq.getRequest();
 		
 			if (StringUtils.isEmpty(msg.getEntityID())) {
-				throw new InvalidProtocolRequestException("pvp2.20", new Object[] {}, "EntityId is null or empty");
+				throw new InvalidProtocolRequestException("pvp2.20", new Object[] {});
 				
 			}