Fix initialization order error for DefaultContext

[aquarium] / src / main / scala / gr / grnet / aquarium / message / avro / MessageFactory.scala

diff --git a/src/main/scala/gr/grnet/aquarium/message/avro/MessageFactory.scala b/src/main/scala/gr/grnet/aquarium/message/avro/MessageFactory.scala
index dbf7dd8..5d8c156 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/message/avro/MessageFactory.scala
+++ b/src/main/scala/gr/grnet/aquarium/message/avro/MessageFactory.scala
@@ -334,10 +334,14 @@ object MessageFactory {
     msg
   }
 
-  def newUserAgreementHistoryMsg(userID: String): UserAgreementHistoryMsg = {
+  def newUserAgreementHistoryMsg(
+      userID: String,
+      originalID: String = MessageHelpers.UserAgreementHistoryMsgIDGenerator.nextUID()
+  ): UserAgreementHistoryMsg = {
     val msg = new UserAgreementHistoryMsg
-    msg.setOriginalID(MessageHelpers.UserAgreementHistoryMsgIDGenerator.nextUID())
+    msg.setOriginalID(originalID)
     msg.setUserID(userID)
+    msg.setAgreements(newJList)
     msg
   }
 
@@ -390,6 +394,7 @@ object MessageFactory {
     msg.setOriginalID(originalID)
     msg.setStateOfResources(newJMap)
     msg.setWalletEntries(newJList)
+    msg.setUserAgreementHistory(newUserAgreementHistoryMsg(userID))
     msg
   }
 }