Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
d6614711
Commit
d6614711
authored
Apr 26, 2018
by
David B Harrison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OF-1540 Rest API and Multi-node Hazelcast cluster - Delete Room not propagated to other nodes
parent
e413abb7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
changelog.html
src/plugins/restAPI/changelog.html
+5
-0
plugin.xml
src/plugins/restAPI/plugin.xml
+2
-2
MUCRoomController.java
...re/openfire/plugin/rest/controller/MUCRoomController.java
+4
-0
No files found.
src/plugins/restAPI/changelog.html
View file @
d6614711
...
@@ -44,6 +44,11 @@
...
@@ -44,6 +44,11 @@
REST API Plugin Changelog
REST API Plugin Changelog
</h1>
</h1>
<p><b>
1.3.3
</b>
-- April 26, 2018
</p>
<ul>
<li>
Fixed: Delete Room now propagated to other cluster nodes
<a
href=
"https://issues.igniterealtime.org/browse/OF-1540"
>
OF-1540
</a></li>
</ul>
<p><b>
1.3.2
</b>
-- April 25th, 2018
</p>
<p><b>
1.3.2
</b>
-- April 25th, 2018
</p>
<ul>
<ul>
<li>
Added: GZIP compression
</li>
<li>
Added: GZIP compression
</li>
...
...
src/plugins/restAPI/plugin.xml
View file @
d6614711
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
<name>
REST API
</name>
<name>
REST API
</name>
<description>
Allows administration over a RESTful API.
</description>
<description>
Allows administration over a RESTful API.
</description>
<author>
Roman Soldatow
</author>
<author>
Roman Soldatow
</author>
<version>
1.3.
2
</version>
<version>
1.3.
3
</version>
<date>
04/2
5
/2018
</date>
<date>
04/2
6
/2018
</date>
<minServerVersion>
4.1.0
</minServerVersion>
<minServerVersion>
4.1.0
</minServerVersion>
<adminconsole>
<adminconsole>
<tab
id=
"tab-server"
>
<tab
id=
"tab-server"
>
...
...
src/plugins/restAPI/src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java
View file @
d6614711
...
@@ -18,6 +18,7 @@ import org.jivesoftware.openfire.muc.MUCRoom;
...
@@ -18,6 +18,7 @@ import org.jivesoftware.openfire.muc.MUCRoom;
import
org.jivesoftware.openfire.muc.NotAllowedException
;
import
org.jivesoftware.openfire.muc.NotAllowedException
;
import
org.jivesoftware.openfire.muc.cluster.RoomAvailableEvent
;
import
org.jivesoftware.openfire.muc.cluster.RoomAvailableEvent
;
import
org.jivesoftware.openfire.muc.cluster.RoomUpdatedEvent
;
import
org.jivesoftware.openfire.muc.cluster.RoomUpdatedEvent
;
import
org.jivesoftware.openfire.muc.cluster.RoomRemovedEvent
;
import
org.jivesoftware.openfire.muc.spi.LocalMUCRoom
;
import
org.jivesoftware.openfire.muc.spi.LocalMUCRoom
;
import
org.jivesoftware.openfire.plugin.rest.entity.MUCChannelType
;
import
org.jivesoftware.openfire.plugin.rest.entity.MUCChannelType
;
import
org.jivesoftware.openfire.plugin.rest.entity.MUCRoomEntities
;
import
org.jivesoftware.openfire.plugin.rest.entity.MUCRoomEntities
;
...
@@ -124,6 +125,9 @@ public class MUCRoomController {
...
@@ -124,6 +125,9 @@ public class MUCRoomController {
if
(
chatRoom
!=
null
)
{
if
(
chatRoom
!=
null
)
{
chatRoom
.
destroyRoom
(
null
,
null
);
chatRoom
.
destroyRoom
(
null
,
null
);
if
(
ClusterManager
.
isClusteringStarted
())
{
CacheFactory
.
doClusterTask
(
new
RoomRemovedEvent
((
LocalMUCRoom
)
chatRoom
));
}
}
else
{
}
else
{
throw
new
ServiceException
(
"Could not remove the channel"
,
roomName
,
ExceptionType
.
ROOM_NOT_FOUND
,
Response
.
Status
.
NOT_FOUND
);
throw
new
ServiceException
(
"Could not remove the channel"
,
roomName
,
ExceptionType
.
ROOM_NOT_FOUND
,
Response
.
Status
.
NOT_FOUND
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment