From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 27 Sep 2006 14:48:27 +0000 (+0000)
Subject: merge  -j 1.2 -j 1.2.18.1 to compile
X-Git-Tag: merge_connpool_src~12
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ee4b6b8828a78a86f20d95bba3cf972c3cd0c468;p=jra1mw.git

merge  -j 1.2 -j 1.2.18.1 to compile
---

diff --git a/org.glite.lb.client/test/producer_test.cpp b/org.glite.lb.client/test/producer_test.cpp
index c2199c5..33da719 100644
--- a/org.glite.lb.client/test/producer_test.cpp
+++ b/org.glite.lb.client/test/producer_test.cpp
@@ -55,14 +55,14 @@ private:
 
   void log_proto_server(int con, char *logline) {
     int i;
-    char b[4];
+    char b[5];
     char *buf;
     ssize_t size, retsize;
 
     // read DGLOG
     retsize = read(con, b, 5);
     CPPUNIT_ASSERT(retsize == 5);
-    CPPUNIT_ASSERT(b[0] = 'D' && b[1] == 'G' && b[2] == 'L' && b[3] == 'O' && b[4] == 'G');
+    CPPUNIT_ASSERT(b[0] == 'D' && b[1] == 'G' && b[2] == 'L' && b[3] == 'O' && b[4] == 'G');
 
     // read size (including '\0', little endian)
     for (i = 0; i < 4; i++)