Commits · 954f099810c763244a203e080b4ebe421cb3f367 · Administrator / Openfire

08 Jan, 2016 6 commits
- Merge pull request #501 from tevans/master · 954f0998
  Guus der Kinderen authored Jan 08, 2016
```
OF-821: Count occupants by nickname
```
  954f0998
- Merge pull request #500 from surevine/OF-1034 · 158e2839
  Guus der Kinderen authored Jan 08, 2016
```
OF-1034 Check for existing sessions properly
```
  158e2839
- OF-821: Count occupants by nickname · e9e1000e
  Tom Evans authored Jan 08, 2016
```
Returns the count of nicknames rather than the number of connections
(full JIDs), which will now also match the list of occupants.
```
  e9e1000e
- OF-1034 Check for existing sessions properly · 13a19a23
  Dave Cridland authored Jan 08, 2016
  
  13a19a23
- Merge pull request #482 from VicoWu/master · 3bd2679c
  Dave Cridland authored Jan 08, 2016
```
solve the memory leak problems which is caused by add LocalMUCRoom ob…
```
  3bd2679c
- Merge pull request #498 from tevans/OF-821 · dff3bb1b
  Dave Cridland authored Jan 08, 2016
```
OF-821: Prevent duplicates for MUC item query
```
  dff3bb1b
07 Jan, 2016 10 commits
- OF-821: Incorporate review feedback · 23cc2a25
  Tom Evans authored Jan 07, 2016
```
Drop unnecessary null check.
```
  23cc2a25
- OF-821: Prevent duplicates for MUC item query · ff1870ff
  Tom Evans authored Jan 07, 2016
```
Corrects issue with multiple JIDs sharing a nickname (masquerading)
```
  ff1870ff
- Merge pull request #496 from aztaru/fixbug-xep0049 · 1c054a2e
  Dave Cridland authored Jan 07, 2016
```
Fix implementation bug for XEP0049.
```
  1c054a2e
- Add name data to prepareStatement in get ( ) method. · a4d91a49
  Lachesis Chiang authored Jan 07, 2016
  
  a4d91a49
- Merge pull request #497 from guusdk/OF-1033 · 2d232c58
  Guus der Kinderen authored Jan 07, 2016
```
OF-1033: Should use the correct status code.
```
  2d232c58
- OF-1033: Should use the correct status code. · 949f3a9a
  Guus der Kinderen authored Jan 07, 2016
  
  949f3a9a
- Check "username and name and namespace" for update or insert · 8c94ff8b
  Lachesis Chiang authored Jan 07, 2016
  
  8c94ff8b
- Merge pull request #491 from guusdk/OF-1029 · 89b5ef5c
  Dave Cridland authored Jan 07, 2016
```
OF-1029: Allow web.xml override via overlay
```
  89b5ef5c
- Merge pull request #495 from guusdk/OF-1033 · 49c06969
  Dave Cridland authored Jan 07, 2016
```
OF-1033: Users should be notified of MUC service shutdown
```
  49c06969
- Fix implementation bug for XEP0049. The comment in Line 105: "If the name and... · 571596f1
  Lachesis Chiang authored Jan 07, 2016
```
Fix implementation bug for XEP0049. The comment in Line 105: "If the name and namespace of the element matches another" is correct, but the implementation is wrong, it checks "username and namespace" rather than "name and namespace".
```
  571596f1
06 Jan, 2016 24 commits

Merge pull request #494 from tevans/websocket-cleanup · 052ede3f
Guus der Kinderen authored Jan 06, 2016
```
Cleanup websocket plugin
```
052ede3f
OF-1033: Make termination timeout configurable · ee04060b
Guus der Kinderen authored Jan 06, 2016

ee04060b

OF-1033: Users should be notified of MUC service shutdown · ab86a3f9

Guus der Kinderen authored Jan 06, 2016

This commit notifies all users that are in a MUC on the local server node of
a shut down of the service. The notification conforms to XEP-0045.

In order to prevent a prolonged shut down, this commit:
- ensures that a shutdown routine is executed just once (instead of for each
  type of interface being shut down: module,component and listener)
- the presence stanza that is sent is constructed using in-memory objects
  only (no database lookups)
- all notification occurs in a thread pool, which will concurrently process
  them, but will terminate forcibly after a certain amount of time.

ab86a3f9

Cleanup websocket plugin · 403e3a75

Tom Evans authored Jan 06, 2016

Update dependencies and documentation to prep for pending Openfire 4.0
release.

403e3a75

Merge pull request #493 from guusdk/OF-1028 · 7768e4fb
Dave Cridland authored Jan 06, 2016
```
OF-1028 Stream Management refactoring
```
7768e4fb
OF-1028: Don't forget to register client ack. · c8269f66
Guus der Kinderen authored Jan 06, 2016

c8269f66

OF-1028: Prevent immediate re-request for ack. · 1a1efa27

Guus der Kinderen authored Jan 06, 2016

Instead of rerequesting ack for every unack'ed stanza over the
threshold, do this only for every few stanzas. This prevents a storm
of ack-requests when data is transmitted to the client faster than it
can respond.

1a1efa27

OF-1028: Restrict the amount of data in memory. · 3bb6ab49

Guus der Kinderen authored Jan 06, 2016

When a peer refuses to ack data, we should not keep it in memory
indefinately. This commit introduces a configurable upper bound,
and when reached causes the queue to be cleared (dropped silently)
while disabling the functionality for that connection.

3bb6ab49

OF-1028: Request ack only when unack'ed stanzas exist. · 422e7ff6

Guus der Kinderen authored Jan 06, 2016

The peer might send unsollicited acks. Instead of requesting ack after every
so many stanzas that we send out, only request ack if we have unack'ed stanzas.

422e7ff6

OF-1028: Rollover should occur at 2^32 · c1b3f28f
Guus der Kinderen authored Jan 06, 2016
```
This commit fixes an overflow issue.
```
c1b3f28f

OF-1028: Store X with each unack'ed stanza · c3ed050a

Guus der Kinderen authored Jan 06, 2016

To safely determine what stanza has and has not been ack'ed by the peer,
store the current value of 'x' with each stanza that's kept. This also
allows for proper handling when the peer rolls over X (at x=2^32).

c3ed050a

OF-1028: Prevent access to internal state. · 231e73ac

Guus der Kinderen authored Jan 06, 2016

Previous commits have applied enough refactoring that it is now no
longer needed to expose internal state. This saves on complexity and
potential concurrency issues.

231e73ac

OF-1028: Remove unused field · 2527acb8

Guus der Kinderen authored Jan 06, 2016

The 'enabled' field is unneeded - the presence of a namespace also
indicates if SM is enabled. Reduces code, saves a little on memory.

2527acb8

OF-1028: Reduce duplicate code · e62c04d9

Guus der Kinderen authored Jan 06, 2016

By moving the processing of Stream Management elements into the
StreamManager implementation, duplicated code can be removed.

e62c04d9

OF-1028: Synchronized block scope should be minimal. · 8e06f9dc

Guus der Kinderen authored Jan 06, 2016

To reduce the chance of lock contention, locks should only be put
in effect when the code accesses data that is sensitive to concurrent
access.

8e06f9dc

OF-1028: Avoid potential concurrency issue. · 3b5e22bb

Guus der Kinderen authored Jan 06, 2016

Prevent exposing access to a field that we're careful to modify
under lock. Again, a defensive copy is a suitable alternative,
but seems unneeded.

3b5e22bb

OF-1028: Avoid potential concurrency issue. · bac4c600

Guus der Kinderen authored Jan 06, 2016

Do not expose the collection of packets that our implementation
modifies only under a mutex (alternatively, we could return a
defensive copy instead, but there does not seem to be a need
to expose the collection in the first place).

bac4c600

OF-1028: Logging should have context · 2889dfcd

Guus der Kinderen authored Jan 06, 2016

Stream (debug) logging is very verbose, but does not provide any context.
This commit adds the address of the peer to each log message.
Additionally, some javadoc fixes were applied.

2889dfcd

Merge pull request #492 from sco0ter/smDelay · 8d2f0722
Guus der Kinderen authored Jan 06, 2016
```
Don't add multiple delayed delivery extension to resent messages.
```
8d2f0722
Merge pull request #490 from sco0ter/websocket · 5b11857d
Dave Cridland authored Jan 06, 2016
```
WebSocket plugin: Fix wrong namespace adding to empty elements
```
5b11857d

Don't add multiple delayed delivery extension to resent messages. · 81363d82

Christian Schudt authored Jan 06, 2016

The issue is that messages, which get resent from offline storage already have an older timestamp.

There should not be another delayed delivery extension, which "overwrites" the old one.

Messages looked like that:
<message><body>...</body><delay xmlns="urn:xmpp:delay" stamp="2016-01-06T13:48:45.312Z"></delay><delay xmlns="urn:xmpp:delay" stamp="2016-01-06T13:49:56.674Z"></delay></message>

Instead the original timestamp should be preserved.

81363d82

OF-1029: Allow web.xml override via overlay · 4ed3afbd
Guus der Kinderen authored Jan 06, 2016

4ed3afbd

WebSocket plugin: Fix wrong namespace adding to empty elements · 3a3faad1

Christian Schudt authored Jan 06, 2016

The old logic produced XML like:
<presence xmlns="jabber:client" from="..." to="..."><show xmlns="">xa</show><status xmlns=""/></presence>

This is basically the same fix as in 6965c13e.

Relates to OF-938.

3a3faad1

Merge pull request #488 from guusdk/logging · 632eec6f
Dave Cridland authored Jan 06, 2016
```
Remove verbose logging
```
632eec6f