From 40b2a3a6100fc764f0e159e7f63c9d450dc58b85 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Fri, 16 Jul 2010 10:47:27 +0000 Subject: [PATCH] Make bundle repository a system bundle and fix jabber tests. --- ...rg.apache.felix.bundlerepository-1.6.4.jar | Bin 153005 -> 151428 bytes ...rationSetPersistentPresenceJabberImpl.java | 4 +- .../ServerStoredContactListJabberImpl.java | 39 ++++++++++-------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar b/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar index 3a48edb41ca59b2995cd4038d34f2a68b9617033..83e026613d566f77d6fb4d433288c8c5a82a1121 100644 GIT binary patch delta 6273 zcmZ`-30PD|w!T#jNV7D}+N{zSkxkZSQK7|FSw!{#n#4hexJOW;(P#`pKzT0F0dBM& zDvA>$(a5N2$&I6;ByOXqn2?vaB*ySYBqNKO1QRD_PTk(_b!Pa!6^0cP8>+sAUk%b z+r6-8(V82dT{;`I>NRbBzw*)W3YX~c*0YrZF^$8!@0@IWN%^<0vV49#|L#3C_nl38 z``BBmW`{Qe`nJyvm+R*JuUp_Z(I@9u4?aBjZejE}yRO?+2h-o5pXfF0t-k+GPg}t8 zLF+@ft$)kPre8l9dnW(d@csy&Q(^U1K65thyE8b~Y3YmG+P|DvVYkgq_rdu^=Y2-1 zY_k6mcrmatZ~j|@)@NSL8lCFAb!g~Tt7~Q8@%ZFL);0cH-s~!>UeJ4Uc))E`?e*!8 ztBULVxbz2HNNi-WI&=R@?QcXk)VEE3<+y`St>Zq&^fxq~(|>U3{pabJj7g(AHn+WA z{_(oD0~AMjoaH>sfeB zd+gZvwPj8WGb>y_+iJa&wZM_+Xs}hf?ZOhXQpF9cTrERa zPU9IO9#(r!b2qJdAJ+WBbzIFF@Uw?|=-KUUVrVpaN1LvFHVosWVwenuILF`svQ&dZ z^@-m5ZHzAWYG6SJ)>gEFr#*OEx@g+Si_|9}3a;j%vk5kAIAVXwHTNkd`;t3st?>r$ z+(5V;xf73V^z~z$kdYjqBpC|O4}`Z$J-4qu+xi$hFGTu|$Ve&o)6Ow2O4v%L71tgT zqMs10wiKCe^~`Sd_!i)M4g7~1-n3PkOB77%<4~BlIm2*I(OK`c?Q$!H!aY*x@5CRp zF}DrnHXeDua~|AZGvxZi+7@eL^!4K)`rhVX^36Exrav|Lpp~R3RZ%BDz7L7hS~1LI zVNK$YgkAMl(jOs-;YZw!&mO|cFFHyMM^AfdBQdnsyY2WMJUTz;u{QsKG(+9&;Ki$u zy(~nAHXs$LO2lKidj(y_z|SON6?r!fG64a3=>v-RU?UTm1dM7ca&D;e(1%wXw=->( z;=+t?=#2ag%SITP-^I)buCBq3{6ULt^-*;rOj$3}Ql~Z4X|R4rgST{3GV&VcnR z0~kg}0~c)dO~VVNas1Wmlof{N{9M7^ZH^%7$=HruO2c-1sSUD{RL733pdY4C-&(#e9_^BzkF+G~`DlnhfILJP=urJ#{YW78~2Gd0a$)37%` zvk1*H_0u;%@qd32eQml#CZ&UI-z*esoV%Njg_BlSg5>QY5kyKl^cZf1w=lM`U@geS=gPQzaF|m zv>4g90R>6izC1;<_d|$vg`9`$_NghdKW0O%;jrGdG!9)SU`H^jgH!suHFs^Nij?O- zi{v(tUxUrLSjit~M}4Lq6jG=bQb@kb#d1G$9^u#^VN!$Isaik8OVckH{vpyYdLq+{Nd`K2fnps zn2Achz7x5~MLR(?VwW$({7fgGn^Z1ds z&=E(Y(=rJ~fEvN8`_Mgc#Z_>M1aY=_RavR#Ic-K3_9J(rvxx;zp#%L$<7@7Zl_g)r zh1^^;RO`SnU0yu0!-pM2`ypR@U^mNHMLbp5Bt-KH!P^WKHaAo=1=jlFL79(9{cXzD zM-F5tLfb$;X2CZolwpWp5f0-&Rb$@X=s2$kwhxY6cs?A@#U%)jl>N5{8u)-es5Mjd zHvN}bhD)An)`sWWb5FIrOoZLwk;fR0-{vT+@OT|s#_Ypl08*YsP2_qMR!^iaMX8Wy z7`RwPe~ECo%ucd0rljT+q*{D|)MxRRuAIWnQ*J?D2h?|qhiGC>ZXryySU}sezPmuD zn_ZWctem$bN@C$k_*|^OmsM2ChauzEa$~Rp*%M_99!1rCfN0%AF|e~TGZn-od)bNT zFbxDd-OKzihyj=I9$=kI)P^2=ZuNT_tngfKZ-*dve@ zlHUK8X90YpMP-D?NhmoQkAvtV!38|PE6zH+30QnVC-{J8fiEobD}^qm0+b@k z=d0rZRZazT0=YCEJAvU%3YFvvP-3D0O-lsmy?g;Wn26oM3dB2$zj^^6E%8r+He?8> zb{7BeCdp626Jc0ShxgWlMJNHe&H@A~oyEttm>{!GR{{s}oW-g-Ge^#7u_xd+D87EX zfKx@TjES66TC#k(IpZW{0$9A-XtJQE;{=6Dcbg!E)AMrzlfl68ykG!gTL*JMeY3dg zq6zZhiZA<%G6fPGO5SOqo38nY=*yHIxJqfR>$+ORfcj?fZ#M*H@U{!ttrLpZLgBBz z72q3pm81eRGDP7p3E)Hh+`}KoaA$@TB0nIyS-fSCGUW6m>;}f&6uSQqAaPAoCIg!P zBcNK%bNe=Sr$tROOp>VU7{*3M>eFzjSzy!S;WGvNmB>W|XlZC(L%_9^Em9cR3(iP< zT0ugyIM>6#DO0f(mC_#Iaz+Xep)qE{<=+Z)mRiJX%oc$#D?Sylpg1!or;1r+KJONt z%rN66yIP%Ko?}bSYlTBEPXlMq;LVYS!^m{d!>|A-W){!Rr&uNoK_#=;yT~xt;U(lG zss;#V7At0wj&vL&fR7`gc zBALa(3k{e_BGY5IJOhZ3#RdX&uo|%Y6g#!VfN7^;Kfqp|23X<>1NIjK)=9Ams|^?k zTIx@@t}`;>x^`JhIP5e};m0ZALvAWUT{f&J*%_fU*_m zL@Y>I+Q>HfK!jf~6LuskAAWN(CLC0{=&!Jg#Jqr6QIb6M)#)inJEsF~;qX2jIx-F8mZnf4Br`T)v{TROAO1V|^W+rS!@ekp(DR zR;G2vq{0{bkvFCYUo%j-tgOI80K>^pp^)%j0K~JriEj~(h2=rfviRj7vb+dK+f@fK L%!3fnnasZcgc`2+ delta 8613 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 KQ?rts#r_}16{{5h diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java index 8cde414d3..4e2ad6c2f 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java @@ -1040,9 +1040,7 @@ public void run() responsePacket.setTo(fromID); parentProvider.getConnection().sendPacket(responsePacket); - } - } - ).start(); + }}).start(); } else if (presenceType == Presence.Type.unsubscribed) { diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java index 900e63190..e104d9d29 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java @@ -886,26 +886,29 @@ public void entriesAdded(Collection addresses) ContactJabberImpl contact = findContactById(entry.getUser()); - if(contact != null && contact.isPersistent()) + if(contact != null) { - contact.setResolved(entry); - continue; - } - else - { - ContactGroup oldParentGroup = - contact.getParentContactGroup(); - // if contact is in not in contact list - // we must remove it from there in order to correctlly - // process adding contact - // this happens if we accept subscribe request - // not from sip-communicator - if(oldParentGroup instanceof ContactGroupJabberImpl - && !oldParentGroup.isPersistent()) + if(contact.isPersistent()) + { + contact.setResolved(entry); + continue; + } + else { - ((ContactGroupJabberImpl)oldParentGroup) - .removeContact(contact); - fireContactRemoved(oldParentGroup, contact); + ContactGroup oldParentGroup = + contact.getParentContactGroup(); + // if contact is in not in contact list + // we must remove it from there in order to correctlly + // process adding contact + // this happens if we accept subscribe request + // not from sip-communicator + if(oldParentGroup instanceof ContactGroupJabberImpl + && !oldParentGroup.isPersistent()) + { + ((ContactGroupJabberImpl)oldParentGroup) + .removeContact(contact); + fireContactRemoved(oldParentGroup, contact); + } } } contact = new ContactJabberImpl(roster.getEntry(id),