projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove “Sone.LatestEdition” property when deleting a Sone.
[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
d63b938
..
8ebf133
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-436,10
+436,6
@@
public class Core implements IdentityListener {
return null;
}
synchronized (localSones) {
return null;
}
synchronized (localSones) {
- if (localSones.containsKey(ownIdentity.getId())) {
- logger.log(Level.FINE, "Tried to add known local Sone: %s", ownIdentity);
- return localSones.get(ownIdentity.getId());
- }
final Sone sone;
try {
sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
final Sone sone;
try {
sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
@@
-490,10
+486,6
@@
public class Core implements IdentityListener {
}
synchronized (remoteSones) {
final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
}
synchronized (remoteSones) {
final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
- if (remoteSones.containsKey(identity.getId())) {
- logger.log(Level.FINE, "Identity already exists: %s", identity);
- return remoteSones.get(identity.getId());
- }
sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition")));
remoteSones.put(identity.getId(), sone);
soneDownloader.addSone(sone);
sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition")));
remoteSones.put(identity.getId(), sone);
soneDownloader.addSone(sone);
@@
-572,9
+564,10
@@
public class Core implements IdentityListener {
return;
}
localSones.remove(sone.getId());
return;
}
localSones.remove(sone.getId());
- soneInserters.remove(sone
.getId()
).stop();
+ soneInserters.remove(sone).stop();
}
identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
}
identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
+ identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
}
/**
}
/**