Merge pull request #119 from Fishbowler/118_fixRoomList

fixes 118: Return full room list from /chatrooms when not searching

Author: Fishbowler

changelog.html

@@ -46,6 +46,7 @@ <h1>
 
 <p><b>1.8.3</b> ???</p>
 <ul>
+    <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/118'>#118</a>] - Cannot retrieve full list of rooms following #113</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/113'>#113</a>] - MUC search including naturalName</li>
 </ul>
 

src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java

@@ -175,12 +175,10 @@ public MUCRoomEntities getChatRooms(String serviceName, String channelType, Stri
         List<MUCRoomEntity> mucRoomEntities = new ArrayList<>();
 
         for (MUCRoomSearchInfo roomInfo : roomsInfo) {
-            String roomName = "";
+            String roomName = roomInfo.getName();
             if (roomSearch != null) {
-                if (StringUtils.containsIgnoringCase(roomInfo.getName(), roomSearch) ||
-                    StringUtils.containsIgnoringCase(roomInfo.getNaturalLanguageName(), roomSearch)) {
-                    roomName = roomInfo.getName();
-                } else {
+                if (!StringUtils.containsIgnoringCase(roomInfo.getName(), roomSearch) &&
+                    !StringUtils.containsIgnoringCase(roomInfo.getNaturalLanguageName(), roomSearch)) {
                     continue;
                 }
             }