projects
/
aquarium
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix NPE with initial user state
[aquarium]
/
src
/
main
/
scala
/
gr
/
grnet
/
aquarium
/
charging
/
state
/
StdUserState.scala
diff --git
a/src/main/scala/gr/grnet/aquarium/charging/state/StdUserState.scala
b/src/main/scala/gr/grnet/aquarium/charging/state/StdUserState.scala
index
2d579a9
..
0b065c8
100644
(file)
--- a/
src/main/scala/gr/grnet/aquarium/charging/state/StdUserState.scala
+++ b/
src/main/scala/gr/grnet/aquarium/charging/state/StdUserState.scala
@@
-163,10
+163,25
@@
final object StdUserState {
occurredMillis: Long,
totalCredits: Double,
initialAgreement: UserAgreementModel,
occurredMillis: Long,
totalCredits: Double,
initialAgreement: UserAgreementModel,
- calculationReason: ChargingReason = InitialUserStateSetup(None)
+ chargingReason: ChargingReason = InitialUserStateSetup(None)
): StdUserState = {
): StdUserState = {
- null: StdUserState
+ StdUserState(
+ "",
+ None,
+ userID,
+ userCreationMillis,
+ totalCredits,
+ None,
+ chargingReason,
+ Nil,
+ Nil,
+ Map(),
+ Map(),
+ 0L,
+ AgreementHistory.initial(initialAgreement),
+ Nil
+ )
}
def createInitialUserStateFromBootstrap(
}
def createInitialUserStateFromBootstrap(