aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/msghistory
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2007-08-10 13:42:31 +0000
committerDamian Minkov <damencho@jitsi.org>2007-08-10 13:42:31 +0000
commitbbe43966ff9bf7641f63fcaf7200c336bcd46519 (patch)
treefc88872dcadb30c941cf5bb065196b481492f414 /src/net/java/sip/communicator/impl/msghistory
parent1e3951d98ce1ccb4943882d977a8219b75b9690d (diff)
downloadjitsi-bbe43966ff9bf7641f63fcaf7200c336bcd46519.zip
jitsi-bbe43966ff9bf7641f63fcaf7200c336bcd46519.tar.gz
jitsi-bbe43966ff9bf7641f63fcaf7200c336bcd46519.tar.bz2
1. Installers now include all bundles in lib/bundles except junit.
2. Fix message history finder methods - findFirstAfter and tests for multiple contacts in meta contact. 3. Some threads were not daemon - more to be checked
Diffstat (limited to 'src/net/java/sip/communicator/impl/msghistory')
-rw-r--r--src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
index 65ba86c..79ff157 100644
--- a/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
@@ -335,13 +335,7 @@ public class MessageHistoryServiceImpl
}
}
- LinkedList resultAsList = new LinkedList(result);
- int startIndex = resultAsList.size() - count;
-
- if(startIndex < 0)
- startIndex = 0;
-
- return resultAsList.subList(startIndex, resultAsList.size());
+ return new LinkedList(result).subList(0, count);
}
/**
@@ -1576,13 +1570,7 @@ public class MessageHistoryServiceImpl
logger.error("Could not read history", e);
}
- LinkedList resultAsList = new LinkedList(result);
- int startIndex = resultAsList.size() - count;
-
- if(startIndex < 0)
- startIndex = 0;
-
- return resultAsList.subList(startIndex, resultAsList.size());
+ return new LinkedList(result).subList(0, count);
}
/**