equal
deleted
inserted
replaced
306 |
306 |
307 def heap_shasum(database_server: Option[SQL.Database], name: String): SHA1.Shasum = { |
307 def heap_shasum(database_server: Option[SQL.Database], name: String): SHA1.Shasum = { |
308 def get_database: Option[SHA1.Digest] = { |
308 def get_database: Option[SHA1.Digest] = { |
309 for { |
309 for { |
310 db <- database_server |
310 db <- database_server |
311 digest <- ML_Heap.get_entries(db, List(name)).valuesIterator.nextOption() |
311 digest <- ML_Heap.read_digests(db, List(name)).valuesIterator.nextOption() |
312 } yield digest |
312 } yield digest |
313 } |
313 } |
314 |
314 |
315 get_database orElse get_session(name).heap_digest() match { |
315 get_database orElse get_session(name).heap_digest() match { |
316 case Some(digest) => SHA1.shasum(digest, name) |
316 case Some(digest) => SHA1.shasum(digest, name) |