Commit 258663ad authored by akrherz's avatar akrherz Committed by Guus der Kinderen

OF-1292 fix NPE when canceling new room creation on admin console

parent db11f0d3
......@@ -87,7 +87,13 @@
// Handle a cancel
if (request.getParameter("cancel") != null) {
response.sendRedirect("muc-room-summary.jsp?roomJID="+URLEncoder.encode(roomJID.toBareJID(), "UTF-8"));
if (roomJID == null) {
// case when canceling creating a new room
response.sendRedirect("muc-room-summary.jsp");
} else {
// case when canceling a room edit, used on summary to set service
response.sendRedirect("muc-room-summary.jsp?roomJID="+URLEncoder.encode(roomJID.toBareJID(), "UTF-8"));
}
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment