Merge pull request #247 from ishmakov/master

Fix collection requests XEP-0059

src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/xep0059/XmppResultSet.java

@@ -49,7 +49,7 @@ public class XmppResultSet
 						catch (NumberFormatException e)
 						{
 							if (setElement.elementText("before").isEmpty()) {
-								this.before = Long.valueOf(9223372036854775807L);
+								this.before = Long.MAX_VALUE;
 							}
 						}
             catch (Exception e)

src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/xep0136/IQRetrieveHandler.java

@@ -61,7 +61,10 @@ public class IQRetrieveHandler extends AbstractIQHandler {
 				fromIndex = resultSet.getAfter().intValue() + 1;
 				toIndex = fromIndex + max;
 			} else if (resultSet.getBefore() != null) {
+				if (resultSet.getBefore()!=Long.MAX_VALUE)
                     			toIndex = resultSet.getBefore().intValue();
+                		else
+                    			toIndex = conversation.getMessages().size();
 				fromIndex = toIndex - max;
 			}
 		}
@@ -76,10 +79,12 @@ public class IQRetrieveHandler extends AbstractIQHandler {
 			addMessageElement(chatElement, conversation, message);
 		}
 
-		if (resultSet != null && messages.size() > 0) {
+		if (resultSet != null) {
+			if (messages.size() > 0) {
                 		resultSet.setFirst((long) fromIndex);
                 		resultSet.setFirstIndex(fromIndex);
                 		resultSet.setLast((long) toIndex - 1);
+            		}
             		resultSet.setCount(conversation.getMessages().size());
             		chatElement.add(resultSet.createResultElement());
 		}