2 files changed, 14 insertions, 13 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
index e7e1e5cbd..f4b5cb4c9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
@@ -144,7 +144,7 @@ public class CreateXMLSignatureRequestBuilderForeign extends Builder {
         else if (ch == '<')
           out.write("&lt;");
         else if (ch == '>')
-          out.write("&gt;");
+          out.write("&gt;"); 
         else if (ch == 'ä')
           out.write("&auml;");
         else if (ch == 'ö')
@@ -164,7 +164,7 @@ public class CreateXMLSignatureRequestBuilderForeign extends Builder {
       }
     }
     catch (IOException ex) {
-      throw new BuildException("builder.00", new Object[] {"GetIdentityLinkForm", ex.toString()});
+      throw new BuildException("builder.00", new Object[] {"CreateXMLSignatureRequest", ex.toString()});
     }
     return out.toString();
   }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index c09cde787..ab93f509c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -212,28 +212,29 @@ public class GetIdentityLinkFormBuilder extends Builder {
     StringWriter out = new StringWriter();
     try {
       for (int ch = in.read(); ch >= 0; ch = in.read()) {
-        if (ch == '"')
+        if (ch == '"') {
           out.write("&quot;");
-        else if (ch == '<')
+        } else if (ch == '<') {
           out.write("&lt;");
-        else if (ch == '>')
+        } else if (ch == '>') {
           out.write("&gt;");
-        else if (ch == 'ä')
+    	} else if (ch == 'ä') {
           out.write("&auml;");
-        else if (ch == 'ö')
+  		} else if (ch == 'ö') {
           out.write("&ouml;");
-        else if (ch == 'ü')
+		} else if (ch == 'ü') {
           out.write("&uuml;");
-        else if (ch == 'Ä')
+		} else if (ch == 'Ä') {
           out.write("&Auml;");
-        else if (ch == 'Ö')
+		} else if (ch == 'Ö') {
           out.write("&Ouml;");
-        else if (ch == 'Ü')
+		} else if (ch == 'Ü') {
           out.write("&Uuml;");
-        else if (ch == 'ß')
+		} else if (ch == 'ß') {
           out.write("&szlig;");
-        else
+		} else  {
           out.write(ch);
+		}
       }
     }
     catch (IOException ex) {