Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2008-10-29 20:22:05 -0400
committerslewis2008-10-29 20:22:05 -0400
commit9e81efd80d9c6e51710ec2beea830452bf92f667 (patch)
tree9c117b56e6299d6d71d452c73a0e92d0845e03a5 /providers/bundles/org.eclipse.ecf.provider.xmpp
parenta6af2c1ddbebf9e0aa9e16cc1659d1989138f406 (diff)
downloadorg.eclipse.ecf-9e81efd80d9c6e51710ec2beea830452bf92f667.tar.gz
org.eclipse.ecf-9e81efd80d9c6e51710ec2beea830452bf92f667.tar.xz
org.eclipse.ecf-9e81efd80d9c6e51710ec2beea830452bf92f667.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=246155
Diffstat (limited to 'providers/bundles/org.eclipse.ecf.provider.xmpp')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPContainerPresenceHelper.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPContainerPresenceHelper.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPContainerPresenceHelper.java
index aa80ff7a3..81d6d9a65 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPContainerPresenceHelper.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/XMPPContainerPresenceHelper.java
@@ -524,13 +524,8 @@ public class XMPPContainerPresenceHelper implements ISharedObject {
private void updateXMPPID(XMPPID newID, XMPPID oldID) {
String newResource = newID.getResourceName();
String oldResource = oldID.getResourceName();
- if (oldResource == null) {
- oldID.setResourceName(newResource);
- } else {
- if (newResource != null && (oldResource.compareTo(newResource) < 0)) {
- oldID.setResourceName(newResource);
- }
- }
+ if (oldResource == null) oldID.setResourceName(newResource);
+ else if (newResource != null) oldID.setResourceName(newResource);
}
private void updatePresenceForMatchingEntry(org.eclipse.ecf.presence.roster.RosterEntry entry, XMPPID fromID, IPresence newPresence) {

Back to the top