Merge remote-tracking branch 'remotes/origin/moa-2.1-Snapshot' into during_authsource_refactoring

3 files changed, 6 insertions, 6 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 991682c9b..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
@@ -54,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/STORKAttrQueryResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
index 1974f4f66..276b26a03 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
@@ -38,7 +38,7 @@ public class STORKAttrQueryResponse implements Serializable {
   private String subStatusCode;

   

   /** Audience restriction. */

-  private transient String audienceRest;

+  private String audienceRest;

   

   /** Error message. */

   private String message;

@@ -65,7 +65,7 @@ public class STORKAttrQueryResponse implements Serializable {
   private List<Assertion> assertions;

   

   /** The complete list from all assertions **/

-  private transient IPersonalAttributeList totalAttributeList = new PersonalAttributeList();

+  private IPersonalAttributeList totalAttributeList = new PersonalAttributeList();

   

   /** All personal attribute lists **/

   private List<IPersonalAttributeList> attributeLists;

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 c4a3e2b6c..62a5343ec 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
@@ -47,7 +47,7 @@ public final class STORKAuthnResponse implements Serializable {
   private String subStatusCode;
   
   /** Audience restriction. */
-  private transient String audienceRest;
+  private String audienceRest;
   
   /** Error message. */
   private String message;
@@ -74,7 +74,7 @@ public final class STORKAuthnResponse implements Serializable {
   private List<Assertion> assertions;
   
   /** The complete list from all assertions **/
-  private transient IPersonalAttributeList totalAttributeList = new PersonalAttributeList();
+  private IPersonalAttributeList totalAttributeList = new PersonalAttributeList();
   
   /** All personal attribute lists **/
   private List<IPersonalAttributeList> attributeLists;