after merge bs_3_fr

2 files changed, 5 insertions, 4 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
index 642b249d4..9a0f87488 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
@@ -13,6 +13,7 @@
  */
 package eu.stork.peps.auth.commons;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -37,7 +38,7 @@ import org.apache.log4j.Logger;
  */
 @SuppressWarnings("PMD")
 public final class PersonalAttributeList extends
-	ConcurrentHashMap<String, PersonalAttribute> implements IPersonalAttributeList{
+	ConcurrentHashMap<String, PersonalAttribute> implements IPersonalAttributeList, Serializable {
   
   /**
    * Logger object.
@@ -53,13 +54,13 @@ public final class PersonalAttributeList extends
   /**
    * Hash with the latest fetched attribute name alias.
    */
-  private final transient Map<String, Integer> latestAttrAlias =
+  private final Map<String, Integer> latestAttrAlias =
     new HashMap<String, Integer>();
   
   /**
    * Hash with mapping number of alias or the attribute name.
    */
-  private final transient Map<String, Integer> attrAliasNumber =
+  private final Map<String, Integer> attrAliasNumber =
     new HashMap<String, Integer>();
   
   /**
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
index dd99cb8f6..cab723837 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
@@ -68,7 +68,7 @@ public final class STORKAuthnResponse implements Serializable {
   private String country;
   
   /** Citizen's personal attribute list. */
-  private transient IPersonalAttributeList attributeList = new PersonalAttributeList();
+  private IPersonalAttributeList attributeList = new PersonalAttributeList();
   
   /** List of all assertions in response *. */
   private List<Assertion> assertions;