summaryrefslogtreecommitdiff
path: root/TAO/tao/Compression
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-03-16 16:38:54 +0000
committermsmit <msmit@remedy.nl>2009-03-16 16:38:54 +0000
commit04730f628ac8ea8abd8cfc2bebdb03a3098f9140 (patch)
tree7d2e90a49484412f9936e50cfb7d6b4796f0b025 /TAO/tao/Compression
parentc0f96126b2a936a170bc4f51489c7f7a42a1a385 (diff)
downloadATCD-04730f628ac8ea8abd8cfc2bebdb03a3098f9140.tar.gz
Mon Mar 16 16:31:25 UTC 2009 Marcel Smit <msmit@remedy.nl>
* tao/Compression/bzip2/Bzip2Compressor.cpp: Fix issue when compressing just a few bytes. * tao/GIOP_Message_Base.cpp: Fixed logging errors. * tao/ZIOP/ZIOP.cpp: * tao/ZIOP/ZIOP.h: Optimized log information. Better handling of exceptions/return values (GIOP should be used). * tests/ZIOP/TestCompressor: * tests/ZIOP/testcompressor.mpb: * tests/ZIOP/TestCompressor/TAO_TestCompressor.pc.in: * tests/ZIOP/TestCompressor/TAO_TestCompressor.rc: * tests/ZIOP/TestCompressor/TestCompressor.cpp: * tests/ZIOP/TestCompressor/TestCompressor.h: * tests/ZIOP/TestCompressor/TestCompressor_export.h: * tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp: * tests/ZIOP/TestCompressor/TestCompressor_Factory.h: * tests/ZIOP/ZIOP.mpc: Added testcompressor. This compressor just throws compression and decompression exceptions. These exception should be handled properly by ZIOP. * tests/ZIOP/client.cpp: * tests/ZIOP/run_test.pl: * tests/ZIOP/server.cpp: Optimized tests. Refactored code by using functions. Optimized tests when TAO_HAS_ZIOP define is zero or not defined. Added test compressor.
Diffstat (limited to 'TAO/tao/Compression')
-rw-r--r--TAO/tao/Compression/bzip2/Bzip2Compressor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
index 70d6ae919c6..7750e6f5962 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
@@ -24,7 +24,7 @@ Bzip2Compressor::compress (
)
{
unsigned int max_length =
- static_cast <unsigned int> (source.length () * 1.1) + 12;
+ static_cast <unsigned int> (source.length () * 1.01) + 600;
target.length (static_cast <CORBA::ULong> (max_length));
int const retval = ::BZ2_bzBuffToBuffCompress (reinterpret_cast <char*>(target.get_buffer ()),