From 53b83c99a868db4f9951438a41e4cdcf4cc5d49b Mon Sep 17 00:00:00 2001
From: Sattvik Chakravarthy <sattvik@supertokens.com>
Date: Thu, 8 Feb 2024 12:36:45 +0530
Subject: [PATCH 1/5] fix: cicd tests (#185)

---
 .../postgresql/test/DbConnectionPoolTest.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/test/java/io/supertokens/storage/postgresql/test/DbConnectionPoolTest.java b/src/test/java/io/supertokens/storage/postgresql/test/DbConnectionPoolTest.java
index 6917e01e..4bdbc707 100644
--- a/src/test/java/io/supertokens/storage/postgresql/test/DbConnectionPoolTest.java
+++ b/src/test/java/io/supertokens/storage/postgresql/test/DbConnectionPoolTest.java
@@ -138,7 +138,7 @@ public void testDownTimeWhenChangingConnectionPoolSize() throws Exception {
                 config
         ), false);
 
-        Thread.sleep(3000); // let the new tenant be ready
+        Thread.sleep(5000); // let the new tenant be ready
 
         assertEquals(300, start.getDbActivityCount("st1"));
 
@@ -157,7 +157,7 @@ public void testDownTimeWhenChangingConnectionPoolSize() throws Exception {
                         successAfterErrorTime.set(System.currentTimeMillis());
                     }
                 } catch (StorageQueryException e) {
-                    if (e.getMessage().contains("Connection is closed")) {
+                    if (e.getMessage().contains("Connection is closed") || e.getMessage().contains("has been closed")) {
                         if (firstErrorTime.get() == -1) {
                             firstErrorTime.set(System.currentTimeMillis());
                         }
@@ -174,6 +174,15 @@ public void testDownTimeWhenChangingConnectionPoolSize() throws Exception {
                 } catch (BadPermissionException e) {
                     errorCount.incrementAndGet();
                     throw new RuntimeException(e);
+                } catch (IllegalStateException e) {
+                    if (e.getMessage().contains("Please call initPool before getConnection")) {
+                        if (firstErrorTime.get() == -1) {
+                            firstErrorTime.set(System.currentTimeMillis());
+                        }
+                    } else {
+                        errorCount.incrementAndGet();
+                        throw e;
+                    }
                 }
             });
         }
@@ -210,4 +219,4 @@ public void testDownTimeWhenChangingConnectionPoolSize() throws Exception {
         process.kill();
         assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STOPPED));
     }
-}
+}
\ No newline at end of file

From f29d7c18b2831065d0b6444bd49bdde5021c1f54 Mon Sep 17 00:00:00 2001
From: Ankit Tiwari <ankucodes@gmail.com>
Date: Thu, 8 Feb 2024 14:11:09 +0530
Subject: [PATCH 2/5] fix: logging test (#187)

---
 .../java/io/supertokens/storage/postgresql/test/LoggingTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/io/supertokens/storage/postgresql/test/LoggingTest.java b/src/test/java/io/supertokens/storage/postgresql/test/LoggingTest.java
index 6e2f792c..1e027162 100644
--- a/src/test/java/io/supertokens/storage/postgresql/test/LoggingTest.java
+++ b/src/test/java/io/supertokens/storage/postgresql/test/LoggingTest.java
@@ -387,7 +387,6 @@ public void testDBPasswordMasking() throws Exception {
 
         Utils.setValueInConfig("info_log_path", "null");
         Utils.setValueInConfig("error_log_path", "null");
-        Utils.setValueInConfig("postgresql_password", "db_password");
 
         System.setOut(new PrintStream(stdOutput));
         System.setErr(new PrintStream(errorOutput));

From 5f2dc1d357bb3e84ac12e8b55912766dab1f021f Mon Sep 17 00:00:00 2001
From: rishabhpoddar <rishabh.poddar@gmail.com>
Date: Thu, 8 Feb 2024 14:30:15 +0530
Subject: [PATCH 3/5] adding dev-v5.0.7 tag to this commit to ensure building

---
 jar/postgresql-plugin-5.0.7.jar | Bin 213155 -> 213155 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/jar/postgresql-plugin-5.0.7.jar b/jar/postgresql-plugin-5.0.7.jar
index 5b50a8447c8cf10be955747fd2a258ee9837b2b3..088261dfb046472cb5de46843064fe871d0f9f5a 100644
GIT binary patch
delta 1739
zcmYL|dr(w$6vyxHcVHuAA%r4!c|TU3%kma<VGR)sB?%lrCW{_C1l(B(qwoQtgpQcZ
z4%}%dM`K{dM<WK!jb@5TOERg*AvGn9v8my&hS6y<%IW^T_cra!?)~gJ-}CsL-?_tG
z#^ElbaZ3q#cuSI(mo(j4+;6mycw{|oxzt)*C8-}Se$)@C-$rK&N&g3^lK#;o5|1A;
zM4a1)<%_@LrR<D{06DaVr@K=O0k9Ste1ZTKp}CI={dm8{8@lo13Ez6c<+N2Zq`Hz?
z1j*xR^=0tv@1F61rL;FDz*kLP<vG-7yQ%h9X>c!Gw~dbt1rY>aA6GQxf#F@6<-ur9
zJY1Qxvzo<g?urK2uHWZyeRK03Dvw{B?+Qf4qNTPF;gY9}Y_kBx&zIFft+YSJ{82<X
z639*%;Z2ER8<AA$h-EH~evf05(8*_#S%trvq-r89udl#Ul3w+Zq#pP8^T~2&B3YFt
zE9>w?p2c*w(;Kucj|FNrR{_gf0o&<P=Jo+OYM9Fany6)W!a#$a%%N5Ov6~h9!xl5Z
z{)`bPQo=uB?`q!9K4o)c6zvS``Kji<I>poSiB6WP%zn<|G|BQ8Y=nG;Bw)1Sykn&#
zP1$9C&TY!=uh>f~k$U|tR-}#L=pD9~P{j8xJN5*;Cm*o)aKFmBhwOru)xh~V?QkFa
z@Yi#o%h<rjun@{`&v2_Y;3uEuXSImwt$dN84^!~$z>?bPWrN!>Ym?PhO>#&!1u5ZG
zd>LV4;Wi*=T@7#7#<Wn+H))w{O}tC%XTr(37BK1Jg$Q7~c!L(uypKCESNZk<UIJ&*
zL0*ULPzHK<n?}Z7UaOJo5PzBB>^Bbc-5gZb$Hz4CIL0fr$!vG?M>J{}<ahm`D;?#R
zvHFVXEI-Kn#bS5+JxuUxmZZ!PCMByI5-ZQ=(+cJ14|s61Xh;4#m{I^%6YT?>GZ9`v
z`BxL+9hBqDWEB<UYBS{m2F>&o#J9|}8J5HldLGahLKT2tLTCq|ER<e=cp{XVVTlf-
z2EfrURU_J14x_Dr@^ET|Ybspt#}PqJSU!xPUTEx*bObOHNnL;~QL0Adxe!G?fRboE
zd?s3ts*IsMa9xX`CL~-RtJV@xW3f~N@U`gubXaupUlwYCYsV@*^SxEn3Cr#{dK=&s
zPcH&m;^{mfGJ*C2P9~5Wkex_}02dRf8?Z5nMgU7m)C#Ciru~4$WVJ)lSfy2;*d;5y
z0ZT!OuKDsmD6-LExaMrM6Hu5+ZvnnbB^f7eOrttjuBNGD5m#BBt{?Dfx*k=Kp~FOm
zT2xez&eU5ym8s7#Ba7aIYcflphI-v*`MGSu>nFdHO||g<ldWHfbG2Go6uhyTTySm5
zp>n|cIrIv^JD0WtnsTWcFr7=U0oJXd4#3nJJz?rvYD2<PYxTV_+i4pt?RLG^f?d5d
iQM4>i?MJ{zdHTjh<WoB=L-|yN%zxyQ9gyXqmVW^>1#(pY

delta 1739
zcmY+DdrXyO9LL}1`N4^h10fV~4)@EE>)~)0^uRF$GK?f}fGmqHTm(Ej7DnL(LJ6IC
z*%`cRl+ze&UYZ!RH`<D&m6=rJNKHv&wi<smrfV7HI`8*+{G)d}=lSgWyS~5Y_YQX(
zhr5l&4Q1rzt0+D`isewr5u=6lBj+iL=crLU57+-Z4|#sg&NNc~A26DNfFHB;!|lfk
z^>e(Oo$}H_4X@*w?leOX)MA5Q2%suF|6#xpi!c1fk0yQR4aI4zWjeSorI$i@G^4Qs
zu)Akk_?Gv@1^IhiYP^S<ZPz{hRU6#%S8d~CLm>puZ;oohbI<TLq1+qION1$VW=1GJ
zvzG*1xq6qw^zHRKs62jtt~(e?>0*1B4(gPVJ*|Tl;LjT1t#v%Y0#QUe5X_DlVNHu+
z>yT9IjAt%Ee<ZL;_^GE-SyiCk_C!WOf04JMyymAUz3w08Qq`_xvT7|>)`=Nt3z=-I
zFEVZ_V8KFj6|tOU&`y>!w;#w+$6N-`L_NC|0UGRL4pI519`<A)w73EGR~#tv6ZWpK
ze)cJwC8OTXz>c5m?s}$pQa#qi(zTh-S%Pp``htxR1|2k7b=I+5QKsx_Am=vi=GW|{
z<w&^p1}ha~ICzWg6mkBy+2O}vJ${e9C#-Akvva~~;QWkuxsUz$8+q`{D&b>T2<`W0
zxK#}J@n`vI5piK7Uts9N6go4o=xOz$!R?r_sh(C%YFI9XXpuF131Rxel^|zB9q$lh
zns4OmMJ8Jd?-u<`I5`&qlP+G20Je=ciGbE!+=;oWH}~)|7*qE025g5m(97Ee8T)v>
zAlE+rvY>1G`F7ENML!=C<aL-=i~5`0{2@V2gZy>?GMA6?i{gq+r}<un4e1HEpA^ul
zDA^-SN%d?<ygFA%%d}rU;GwO0kor$3r2(ua+66dcB7B1CZzjSws3w@n3RA6_@&SWp
zdIE66OxR~NIgFl%(jP`ufM3IC3!oyLUI0vllPDS+K}}E&Mo6Ef2-*mxGLo7BQ<1VC
zM-(}sd>BQ20DCkY08B?yH(*1I^f?zpy-><xW%zWgjH-^K9WY&qqZYv0cv)*Kp6a0Z
zTVy|-7U}%Ah1y`+vO;FQvx2&yY)_y=0G~v95zv-MX93Ykv=eYViQItPWZDNfpG-Y~
zbtyCgSWKZ;0gb7&8?cZnJFK?KiG5|IH(@GDlRjTQfKnUnhiTSETLH!C^fuu8bW#D$
z8Pou{oFT_jnJHiJa;A(b%91dV_28PaWveH$<qWfO=q==#%#qXZT(?<$E|>86sqf@c
zJ?#JH$_sI>l$EcoBo|EU^QaQ=ejdF7@Xe>qfR=o!1zgCd*8yu*Q72$(l}wnvn%be9
tSS=N^oi;(~u*+KWc6n(P1+t%y3gpH`6;cPBhYG0%@Mj^}0XYt8`wxjV7~cQ@


From f540b86874c54bfa1538eba0a19f2cb58c2f1f1b Mon Sep 17 00:00:00 2001
From: Sattvik Chakravarthy <sattvik@supertokens.com>
Date: Thu, 8 Feb 2024 19:14:21 +0530
Subject: [PATCH 4/5] fix: flaky test (#188)

---
 .../postgresql/test/DbConnectionPoolTest.java | 193 ++++++++++--------
 1 file changed, 103 insertions(+), 90 deletions(-)

diff --git a/src/test/java/io/supertokens/storage/postgresql/test/DbConnectionPoolTest.java b/src/test/java/io/supertokens/storage/postgresql/test/DbConnectionPoolTest.java
index 4bdbc707..18d123d5 100644
--- a/src/test/java/io/supertokens/storage/postgresql/test/DbConnectionPoolTest.java
+++ b/src/test/java/io/supertokens/storage/postgresql/test/DbConnectionPoolTest.java
@@ -114,109 +114,122 @@ public void testActiveConnectionsWithTenants() throws Exception {
     public void testDownTimeWhenChangingConnectionPoolSize() throws Exception {
         String[] args = {"../"};
 
-        TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
-        FeatureFlagTestContent.getInstance(process.getProcess())
-                .setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
-        process.startProcess();
-        assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));
-
-        Start start = (Start) StorageLayer.getBaseStorage(process.getProcess());
-        assertEquals(10, start.getDbActivityCount("supertokens"));
-
-        JsonObject config = new JsonObject();
-        start.modifyConfigToAddANewUserPoolForTesting(config, 1);
-        config.addProperty("postgresql_connection_pool_size", 300);
-        AtomicLong firstErrorTime = new AtomicLong(-1);
-        AtomicLong successAfterErrorTime = new AtomicLong(-1);
-        AtomicInteger errorCount = new AtomicInteger(0);
-
-        Multitenancy.addNewOrUpdateAppOrTenant(process.getProcess(), new TenantConfig(
-                new TenantIdentifier(null, null, "t1"),
-                new EmailPasswordConfig(true),
-                new ThirdPartyConfig(true, null),
-                new PasswordlessConfig(true),
-                config
-        ), false);
-
-        Thread.sleep(5000); // let the new tenant be ready
-
-        assertEquals(300, start.getDbActivityCount("st1"));
-
-        ExecutorService es = Executors.newFixedThreadPool(100);
-
-        for (int i = 0; i < 10000; i++) {
-            int finalI = i;
-            es.execute(() -> {
-                try {
-                    TenantIdentifier t1 = new TenantIdentifier(null, null, "t1");
-                    TenantIdentifierWithStorage t1WithStorage = t1.withStorage(StorageLayer.getStorage(t1, process.getProcess()));
-                    ThirdParty.signInUp(t1WithStorage, process.getProcess(), "google", "googleid"+ finalI, "user" +
-                            finalI + "@example.com");
-
-                    if (firstErrorTime.get() != -1 && successAfterErrorTime.get() == -1) {
-                        successAfterErrorTime.set(System.currentTimeMillis());
-                    }
-                } catch (StorageQueryException e) {
-                    if (e.getMessage().contains("Connection is closed") || e.getMessage().contains("has been closed")) {
-                        if (firstErrorTime.get() == -1) {
-                            firstErrorTime.set(System.currentTimeMillis());
+        for (int t = 0; t < 5; t++) {
+            TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
+            FeatureFlagTestContent.getInstance(process.getProcess())
+                    .setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
+            process.startProcess();
+            assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));
+
+            Start start = (Start) StorageLayer.getBaseStorage(process.getProcess());
+            assertEquals(10, start.getDbActivityCount("supertokens"));
+
+            JsonObject config = new JsonObject();
+            start.modifyConfigToAddANewUserPoolForTesting(config, 1);
+            config.addProperty("postgresql_connection_pool_size", 300);
+            AtomicLong firstErrorTime = new AtomicLong(-1);
+            AtomicLong successAfterErrorTime = new AtomicLong(-1);
+            AtomicInteger errorCount = new AtomicInteger(0);
+
+            Multitenancy.addNewOrUpdateAppOrTenant(process.getProcess(), new TenantConfig(
+                    new TenantIdentifier(null, null, "t1"),
+                    new EmailPasswordConfig(true),
+                    new ThirdPartyConfig(true, null),
+                    new PasswordlessConfig(true),
+                    config
+            ), false);
+
+            Thread.sleep(5000); // let the new tenant be ready
+
+            assertEquals(300, start.getDbActivityCount("st1"));
+
+            ExecutorService es = Executors.newFixedThreadPool(100);
+
+            for (int i = 0; i < 10000; i++) {
+                int finalI = i;
+                es.execute(() -> {
+                    try {
+                        TenantIdentifier t1 = new TenantIdentifier(null, null, "t1");
+                        TenantIdentifierWithStorage t1WithStorage = t1.withStorage(StorageLayer.getStorage(t1, process.getProcess()));
+                        ThirdParty.signInUp(t1WithStorage, process.getProcess(), "google", "googleid"+ finalI, "user" +
+                                finalI + "@example.com");
+
+                        if (firstErrorTime.get() != -1 && successAfterErrorTime.get() == -1) {
+                            successAfterErrorTime.set(System.currentTimeMillis());
+                        }
+                    } catch (StorageQueryException e) {
+                        if (e.getMessage().contains("Connection is closed") || e.getMessage().contains("has been closed")) {
+                            if (firstErrorTime.get() == -1) {
+                                firstErrorTime.set(System.currentTimeMillis());
+                            }
+                        } else {
+                            errorCount.incrementAndGet();
+                            throw new RuntimeException(e);
                         }
-                    } else {
+                    } catch (EmailChangeNotAllowedException e) {
                         errorCount.incrementAndGet();
                         throw new RuntimeException(e);
-                    }
-                } catch (EmailChangeNotAllowedException e) {
-                    errorCount.incrementAndGet();
-                    throw new RuntimeException(e);
-                } catch (TenantOrAppNotFoundException e) {
-                    errorCount.incrementAndGet();
-                    throw new RuntimeException(e);
-                } catch (BadPermissionException e) {
-                    errorCount.incrementAndGet();
-                    throw new RuntimeException(e);
-                } catch (IllegalStateException e) {
-                    if (e.getMessage().contains("Please call initPool before getConnection")) {
-                        if (firstErrorTime.get() == -1) {
-                            firstErrorTime.set(System.currentTimeMillis());
-                        }
-                    } else {
+                    } catch (TenantOrAppNotFoundException e) {
+                        errorCount.incrementAndGet();
+                        throw new RuntimeException(e);
+                    } catch (BadPermissionException e) {
                         errorCount.incrementAndGet();
-                        throw e;
+                        throw new RuntimeException(e);
+                    } catch (IllegalStateException e) {
+                        if (e.getMessage().contains("Please call initPool before getConnection")) {
+                            if (firstErrorTime.get() == -1) {
+                                firstErrorTime.set(System.currentTimeMillis());
+                            }
+                        } else {
+                            errorCount.incrementAndGet();
+                            throw e;
+                        }
                     }
-                }
-            });
-        }
+                });
+            }
 
-        // change connection pool size
-        config.addProperty("postgresql_connection_pool_size", 200);
+            // change connection pool size
+            config.addProperty("postgresql_connection_pool_size", 200);
 
-        Multitenancy.addNewOrUpdateAppOrTenant(process.getProcess(), new TenantConfig(
-                new TenantIdentifier(null, null, "t1"),
-                new EmailPasswordConfig(true),
-                new ThirdPartyConfig(true, null),
-                new PasswordlessConfig(true),
-                config
-        ), false);
+            Multitenancy.addNewOrUpdateAppOrTenant(process.getProcess(), new TenantConfig(
+                    new TenantIdentifier(null, null, "t1"),
+                    new EmailPasswordConfig(true),
+                    new ThirdPartyConfig(true, null),
+                    new PasswordlessConfig(true),
+                    config
+            ), false);
 
-        Thread.sleep(3000); // let the new tenant be ready
+            Thread.sleep(3000); // let the new tenant be ready
 
-        es.shutdown();
-        es.awaitTermination(2, TimeUnit.MINUTES);
+            es.shutdown();
+            es.awaitTermination(2, TimeUnit.MINUTES);
 
-        assertEquals(0, errorCount.get());
+            assertEquals(0, errorCount.get());
 
-        assertEquals(200, start.getDbActivityCount("st1"));
+            assertEquals(200, start.getDbActivityCount("st1"));
 
-        // delete tenant
-        Multitenancy.deleteTenant(new TenantIdentifier(null, null, "t1"), process.getProcess());
-        Thread.sleep(3000); // let the tenant be deleted
+            // delete tenant
+            Multitenancy.deleteTenant(new TenantIdentifier(null, null, "t1"), process.getProcess());
+            Thread.sleep(3000); // let the tenant be deleted
 
-        assertEquals(0, start.getDbActivityCount("st1"));
+            assertEquals(0, start.getDbActivityCount("st1"));
 
-        System.out.println(successAfterErrorTime.get() - firstErrorTime.get() + "ms");
-        assertTrue(successAfterErrorTime.get() - firstErrorTime.get() < 250);
-        assertTrue(successAfterErrorTime.get() - firstErrorTime.get() > 0);
-        process.kill();
-        assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STOPPED));
+            System.out.println(successAfterErrorTime.get() - firstErrorTime.get() + "ms");
+            assertTrue(successAfterErrorTime.get() - firstErrorTime.get() < 250);
+
+            if (successAfterErrorTime.get() - firstErrorTime.get() == 0) {
+                process.kill();
+                assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STOPPED));
+                continue; // retry
+            }
+
+            assertTrue(successAfterErrorTime.get() - firstErrorTime.get() > 0);
+            process.kill();
+            assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STOPPED));
+
+            return;
+        }
+
+        fail(); // tried 5 times
     }
 }
\ No newline at end of file

From abe531269fef0f742a780e0a7282ed9046f4a309 Mon Sep 17 00:00:00 2001
From: rishabhpoddar <rishabh.poddar@gmail.com>
Date: Thu, 8 Feb 2024 19:14:55 +0530
Subject: [PATCH 5/5] adding dev-v5.0.7 tag to this commit to ensure building

---
 jar/postgresql-plugin-5.0.7.jar | Bin 213155 -> 213155 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/jar/postgresql-plugin-5.0.7.jar b/jar/postgresql-plugin-5.0.7.jar
index 088261dfb046472cb5de46843064fe871d0f9f5a..3af418895e8c5f597a53f0fd448099410197678a 100644
GIT binary patch
delta 1527
zcmY+De@xV69LMi@K60YmkpjgyjvoTYPmen|4&?VKj!;60luoZ!>J(25hzgR7_@Rb6
zHr;W3HK&8IZsfG2YkirUG|gQ8s9?!xR~F4|u0L8f-9lUI`+gq(>9+g6K0n^i=lMLJ
z=ldP)HIDWg4fVCOV6jdY9<B==KWfO}+S6HU2_3I->$D%oL;I2T_qN(d_doduR>*HU
zwWlwFxikdp*qH?y6|;vI_-y)U#8&H#vEXwFrHjBL=@HNbPiB7`2DaEYGmXA$c{Olj
z@^?N9cK3fRWOW0U=twjacEW29X&pVU_x&<!51u;_OVC|CH6e8Uqpu17??6cw;ssOF
z!e4mvhTzQX1CIEO(0yzdy!2yV3|M`y!>m!6G_rLX)yPQJ1fklwghipUdN_uS7-8h5
zu(hbAc3D`vF#gD7=b=$fTiHfrST4JRQ>k|ytaUMrO%?1(5oxPpMG=U6xQ-1OU{rco
zyB<bx3!6)X;qPH9Md9!J*_x$@r25%>8jQsA?4(FtxWHz}h>7_3-tyenCUROC?qPZA
z)J2vl6b~=60EwAJ2R4kmqI9~?%ax^^+tr`GV%wrnt?CC>BMvwCGwT+MjJMg*r;r++
zXQxEU^)LHEq{28qC(fc8cvmqrj%q%R%T#|`&uwB_u?_sJ5MSBIe`jKIQ{0sQp4Q$~
zz0WmeSG4v_in)kl)g(86ghhBwo<^1J9==CRWUh(Vi7K{c-Y1#}wsI2MiC1~Grv0p)
zdxf;Qo3~+j%B_9;85GIc&zo?w>d*n+Aq>L+-zto@gM7O%W)JaB(Qf@99~TB4;cl_x
zi#{GMjHdVauTP*(U4UN`Hy3w?9}vq&&T{u|?D;5;?4Z>|?|>hf2%mv+$3*xJl#F<?
zf$n%J1^w|<1%~1YFPV~UrkBB$MPydS%!HvTx6RZH)+f*wFqlBEfGLUO1qTyl{$V0D
z!f!~TUEpMrY@#xm+Tf2T(?PIo84ZHhmr)<MK1Jp)rqH|a*QUyK*HfjwF^%3vd?t;=
zA*(F1{>K)20dZrx+`lVb>gLm_1#xeNtoK(2^}>H6QyZ$rg;}%>+?_?AfXUg^4Gw41
z5LlQ)hrmlYv=6LVP66=G<@7qZ!%98iU90S;F;~vx%UpU3@l`gNzx<fhb~=pscXnz8
zSLe|H_)Q)i19#?A6F8kO&)wjV=a_a#{i*`VV8P?LJ7r&EPB|Y(A@yVZM4>#dc6s>b
zm19M;75t}2&bMWS+-G(LwIg0zOdG(FV%h;NDxsIaT_v;`yi!7Mg05293r?2GI`%T^
vfIn6yeN#Dk;CGhG`g7%S{`D1d|4%FAdy-U1d!T#2k~V=4Dyaf=x~SzpvTj-w

delta 1527
zcmYL|e@xV69LMi@K5(LNq(Cu_<3Ql}>2U|gaq{~VM<{_rO6b)}o#F`rK|zucKh#ji
zCIkAqoDRmik<*f{^<{3-G{gK+!IIG^i)J?0A1#}1p{@12pKn{Y-S_qR@qRwf=lML}
z?^w5CtlJP$RZambbh@A*-PP8CkYp~N&T`9iYgw&M{5T%sN8;~ovXSn8`E={R`&KTV
zx13_pU@&tF$6vwD1_&x956>R7>BAA*pf^N<&&A{~7gGQ6q+n?Lr_#O&1RL$!8A@Ew
zEJHdXYwxoNclLf20KcNo5*~_%0#ADF3!<av^@Bgp+x_QHMiTPZPESf*?^vt!|MKOf
zBAz`nEB$4+Zc5J0KjettTzG)({Fi^|iNHRk_uEXuSEdZCQcw*IWpxm$?JHRrDyzpL
z*r)+UMm*buT55-dwMgUl6m|g`<&2eWMTTXtyMZw7Iat#Q7~6{2lQPm=!d$_Kd{D`T
zLSPhoSc@Kpe+OGM!x-*j>tx~YdfCQRh$IZNr9{!EYQDfu$<)P*Y>o_9#YBb=-1a;W
z6FH-dbg@iz<`PShibq$Nk3yjc_idSQhv{^m6)LMZx2r#X$##XIY{~bmOdhWPC)P=*
zZ@9w-o<eG5iJis;sqTN+=dxZP=jY{F)DYg03yq_cPvA1uUpI4`oK|EtKPSc0TlsHH
zZf=a48NM&tyQUv>&)5~wo>4KmC{m5B<&UulugTM>vfIP=%ZV)3@d{bRR?mB66aFSn
zQakx7FBRHPTew$B>pOWfhNs*<$e%%x^h3N3H>(aE=55jl>Ek=4(R_sOW;oLPQQppB
zRQ2--Y0z<AE6@MpAP<s8-MjpkC!neD@#}a))u^-luv|WRj@LF|&&N?@2dzeW8~o5n
z_zaZ0M#6WXBuA4Ctc|98a5$PukY9+VO899edKp~jB9k(1qFgw4OjHk6#n29j{W0_k
z{CG2Y!G5#Ii})im)qvHpv=8yASgncTIBJGJ5l2UmFIY|e;EmPP18$BNdBIEZ^bWWw
zL0fktLDSbH(p!knB~k<GlvqT4;eTYI7eGUjwtq*Grdvv)M#R0zTD?D$sT=<5DPpLC
z%Tj3<*pNyegK=rp367-E5SWurN5RYKbPz0CLq712HS`*|$4Xt`J*((PuqH#B#}^s&
zCj9j_Eq~=dmfGnU;@{e-3EYrLec;!bbOPtun?-f-XS2k)g<tK^&N1uI^y{-V`m@D8
zLKpAU`Wkm?^Ks-*FXEFq+Ihw0;hR@ZxM(N%w@aIE<65zgs6W4!S`aVKr7hrSF6{xA
z=g~{xzC79vPUq1ZpgW%qfK&Ne9eV+_q0V@LcCW@l^1yE|)aox5iunt_sz~fF_(_rW
Yp2QZ@e)#Vd(>Bz5SWHEr(@l;40#3j*3IG5A