Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OF-1046: Improve offline-storage usage #522

Merged
merged 1 commit into from Jan 21, 2016
Merged

OF-1046: Improve offline-storage usage #522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/java/org/jivesoftware/openfire/OfflineMessageStrategy.java
View file
Open in desktop
Expand Up @@ -148,12 +148,15 @@ else if (message.getType() == Message.Type.error) {
store(message);
}
else {
Log.debug( "Unable to store, as user is over storage quota. Bouncing message instead: " + message.toXML() );
bounce(message);
}
break;
case store_and_drop:
if (underQuota(message)) {
store(message);
} else {
Log.debug( "Unable to store, as user is over storage quota. Silently dropping message: " + message.toXML() );
}
break;
case drop:
Expand Down Expand Up @@ -200,7 +203,7 @@ private void store(Message message) {

private void bounce(Message message) {
// Do nothing if the sender was the server itself
if (message.getFrom() == null) {
if (message.getFrom() == null || message.getFrom().equals( serverAddress )) {
return;
}
try {
Expand Down