projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove exception from Identity interface, let null signal an error.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
core
/
Core.java
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
763b024
..
053e042
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-899,8
+899,10
@@
public class Core implements IdentityListener {
}
/**
}
/**
- * Retrieves the trust relationship from the origin to the target.
+ * Retrieves the trust relationship from the origin to the target. If the
+ * trust relationship can not be retrieved, {@code null} is returned.
*
*
+ * @see Identity#getTrust(OwnIdentity)
* @param origin
* The origin of the trust tree
* @param target
* @param origin
* The origin of the trust tree
* @param target
@@
-912,12
+914,7
@@
public class Core implements IdentityListener {
logger.log(Level.WARNING, "Tried to get trust from remote Sone: %s", origin);
return null;
}
logger.log(Level.WARNING, "Tried to get trust from remote Sone: %s", origin);
return null;
}
- try {
- return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not get trust for Sone: " + target, wote1);
- return null;
- }
+ return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
}
/**
}
/**