1 files changed, 24 insertions, 18 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
index 21e97ee9..875192a1 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
@@ -57,29 +57,35 @@ public class StatusMessageProvider implements IStatusMessenger {
 	  private static final Locale DEFAULT_EXTERNALERROR_LOCALES = new Locale("en", "GB");
 	  private ResourceBundle externalError = null;
 	
-	@Override
-	public String getMessage(String messageId, Object[] parameters) {
-		 // initialize messages
-	    if (messages == null) {	    	
-	      this.messages = PropertyResourceBundle.getBundle(
-	              DEFAULT_MESSAGE_RESOURCES,
-	              DEFAULT_MESSAGE_LOCALES);
-	              
-	    }
+	  @Override
+	  public String getMessageWithoutDefault(String messageId, Object[] parameters) {
+		  // initialize messages
+		    if (messages == null) {	    	
+		      this.messages = PropertyResourceBundle.getBundle(
+		              DEFAULT_MESSAGE_RESOURCES,
+		              DEFAULT_MESSAGE_LOCALES);
+		              
+		    }
 
-	    // create the message
-	    if (messages == null) {
-	      return MessageFormat.format(ERROR_MESSAGES_UNAVAILABLE, new Object[] { messageId });
+		    // create the message
+		    if (messages == null) {
+		      return MessageFormat.format(ERROR_MESSAGES_UNAVAILABLE, new Object[] { messageId });
 
-	    } else {	    	
-	      try {
-	        String rawMessage = messages.getString(messageId);
-	        return MessageFormat.format(rawMessage, parameters);
+		    } else {
+		    	 String rawMessage = messages.getString(messageId);
+			     return MessageFormat.format(rawMessage, parameters);
+		    	
+		    }
+	  }
+	  
+	@Override
+	public String getMessage(String messageId, Object[] parameters) {   	
+		try {
+	        return getMessageWithoutDefault(messageId, parameters);
 	        
-	      } catch (MissingResourceException e2) { 
+	    } catch (MissingResourceException e2) { 
 	        return MessageFormat.format(ERROR_NO_MESSAGE, new Object[] { messageId });
 	        
-	      }
 	    }						
 	}