From 8f0c0adcb4df7e130594a6d4cc4e53ec3eb137da Mon Sep 17 00:00:00 2001 From: bancika Date: Sun, 22 Mar 2020 12:14:01 +0100 Subject: [PATCH] Add null protection for announcements --- .../announcements/AnnouncementProvider.java | 4 +++- diylc/diylc-library/lib/diylc-core.jar | Bin 296926 -> 296926 bytes diylc/diylc-swing/lib/diylc-core.jar | Bin 296926 -> 296926 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/diylc/diylc-core/src/org/diylc/announcements/AnnouncementProvider.java b/diylc/diylc-core/src/org/diylc/announcements/AnnouncementProvider.java index afb00e21..872b6cf0 100644 --- a/diylc/diylc-core/src/org/diylc/announcements/AnnouncementProvider.java +++ b/diylc/diylc-core/src/org/diylc/announcements/AnnouncementProvider.java @@ -58,7 +58,9 @@ public class AnnouncementProvider { } public String getCurrentAnnouncements(boolean forceLast) throws ParseException { - announcements = service.getAnnouncements(); + announcements = service.getAnnouncements(); + if (announcements == null) + return null; boolean hasUnread = false; StringBuilder sb = new StringBuilder(""); for (int i = 0; i < announcements.size(); i++) { diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 9cf4d56931e97ea054f042da475bbb93d648e810..6f2c606361fc3b107ac04e5fd23596c595c2ca72 100644 GIT binary patch delta 4753 zcmY*bX;_w38s?n$2&jmJC`f=TYKVaW$||b}eC#`dETRa4EJlcEAc`P%nd_InW@>KP zC8=nppA9KyF{K!hG>&^YHH;}LI+=PIHs^Vs_s{&{zMuP9&-Q-Y+F*HWgQZzgtRjXP z8JQXxjn{25o5Wpon|vS1zj`<32oT36^6@%-8@JPMWHvxsnLEH$<_TcN0|9h=GC&RY z1!&__0a}@zdd8ZW{9hBjmEr-;2nn)&H38H=t6=?WN&xuBh+u#W@dm&e@w$ZLC&eZX zs5ANJ5Rjcm{0d-d{wJu$BQG$(OBVYOmss9bz|J1C8ts2sAHwX7wi^+h?L*OD=r|7T zX6HRbb6B%1(+2KSe_*W*+QZgO2LC?a4H)LXX*i%hQr`;MkM%<#T0gk;K0v>E3E=Fu z>)_n^elq3^d@vU=ZI>QL`R(9JY*BXj3hI$Zjj>h2F>ADokJCt-PE?^i1bw7!QA zRZph~tK&U4j&cm}bA8$6&y0+oFsgj$r!=g@Z@(n`r5!tU^c}#;#lPJ|J@TF_UYSLY zkD~7Uq)Wh39zK5ow!Z(*{a|h${1Va)>5R33ZZHDbpuUXPcfK~`uI zlQ&z|Io*Z`Iafww<-2a%v}g zg5}$GvuISF?_(*b#2;XjFuk^w*&|Vpuy1j13p!X2#(1A&cae^#AXbIc`EO)bF}pTIKLm0C6}J2K1z{G-&G_`47vTR7!&{gkaZww`7axV zWXB(D7Lq@nvs5IpgRCCNi3_|Cg*OD3pCH*J)r3!CK$e^GDX6p!=cY(LH|MlN?v^|T zm8GNkVI;0&`Hx6m+VNMByz0msk$mXFmm?YX8vh*0H8(zhyVgdb6>0+HJh8m!!~5* z@L}-LR_7J)e}fP+m#>DWZMam#ua5xIR?Y9@tKL=1OOOn$^;YOvH6lt{xvE=-*6AC zSAKyfqU+2>ZjPk8n~y^BOAp_Mq`sGbi6rzg-;3neE8GIp|G3T#Sg`FT-)as`qxyLn z#+-P-r#XVsZ?61+O2;dTykt^&;Gzs**3T1^yQp0BQ=DM`4G)8qNDTH3RnGGf@G}q) z=6iLkyerY_gG^7OWS@T?0biv%Q}O%ZdTvO307Ks`0tQ-lKQJ>@@I z5<5MG5BLW?MFik2Z(*nAdkH5n8ofjqV5gUe1+?@Q@ZX=B=q;iEWs;rxnYVBSLuLj6 z+E2y*XkumuVsf;wqv81sD}Ti+NAO+X2+iKTuSF|6rh4 z061#8NC7O?uzfn^j}D@K#X;n64-%;mXAvyY0E>dD|EIyUJ|05#vqMBQ`1gm1DnOf1 zimwQzdS^pvPV+Fz%hT{k82Yz{)7bIh)OJrer9TZ9xlk@+hDZiHID_=RG&?1N#y%7w z=78UPrYHeiI+M2d>P#^Y?BGbkeUV}z*cMULr!Yz+f_*|m<7gT$BbvtDui3vxQ~xL( zZO0BBEw@i6A|c-+M!=<4--#i;H%92dc8Dc^Q7p~Gy8jiq>k&OUwYAo+V}iuF8`4MPg4D<&ViG z%*m#@`!(#(me*Cr`OT)hhS?O?sp0S(`PQXBEr;TE=TQEg9C?0H_s*sMt2FG*mFt)K zSi^uh6t{8?znzT_9sx(*f4JkKRFZ2 zy0c4Zo;{@$_o$TW1}vnw#)afRzmVn{RYsUwM*DNHjQj%{`j%7wrgGA|$|+v%x1H)) zAtu9O^D4;sQ3W|4R#5YhN@~8QlJrZJbP4PiQPI*xawz$@K3znQdr-sZH>F?dTi&Ec za`#P{FYT#S^bu*SBLDYQ^r#%)lEX`X*<198&b>wPX4Uk#3ajbS7^*3M$YOd_S&QkT zaB8ub4f&&M$gZxTk3dh2n2UXvhyp-$3E3}}&_}VTRuqBWT}!_KeoHCtgQYZA|5BPK zd>MT#c53)c!_>D)KceB#IO-YZ>wpppcbmTzC|Sc54der A;s5{u delta 4753 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 A;s5{u delta 4753 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