projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return a nullable Album instead of an Optional
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
database
/
memory
/
MemoryDatabase.java
diff --git
a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
index
79c34d7
..
0223c82
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/
src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@
-478,11
+478,12
@@
public class MemoryDatabase extends AbstractService implements Database {
// ALBUMPROVDER METHODS
//
// ALBUMPROVDER METHODS
//
+ @Nullable
@Override
@Override
- public
Optional<Album> getAlbum(
String albumId) {
+ public
Album getAlbum(@Nonnull
String albumId) {
lock.readLock().lock();
try {
lock.readLock().lock();
try {
- return
fromNullable(allAlbums.get(albumId)
);
+ return
allAlbums.get(albumId
);
} finally {
lock.readLock().unlock();
}
} finally {
lock.readLock().unlock();
}