# HG changeset patch # User aidan # Date 1313153756 -3600 # Node ID 2bc8cc69d2a5827b41e1efd86dca191129538279 # Parent 8f9f167096eef5031def64a9d47d16f4a95d9b1d removed bpq block complete check to the BPQBlockProcessor diff -r 8f9f167096ee -r 2bc8cc69d2a5 servlib/bundling/BPQBlock.cc --- a/servlib/bundling/BPQBlock.cc Fri Aug 12 13:00:05 2011 +0100 +++ b/servlib/bundling/BPQBlock.cc Fri Aug 12 13:55:56 2011 +0100 @@ -182,7 +182,7 @@ log_debug_p(LOG, "BPQBlock::initialise: b->source() == NULL"); block = b; } - +///////////////////////////////////////////////////// ASSERT ( block != NULL ); log_debug_p(LOG, "BPQBlock::initialise: block != NULL"); @@ -194,7 +194,17 @@ (block->complete()) ? "true" : "false" ); log_debug_p(LOG, "BPQBlock::initialise: reloaded() = %s", (block->reloaded()) ? "true" : "false" ); +//////////////////////////////////////////////////// + if(block->data() == NULL) { + log_debug_p(LOG, "BPQBlock::initialise: block->data() == NULL"); + kind_ = KIND_QUERY; + matching_rule_ = 1; + query_len_ = 0; + query_val_ = 0; + + return BP_FAIL; + } int decoding_len=0; u_int i=0, j=0; diff -r 8f9f167096ee -r 2bc8cc69d2a5 servlib/bundling/BPQBlockProcessor.cc --- a/servlib/bundling/BPQBlockProcessor.cc Fri Aug 12 13:00:05 2011 +0100 +++ b/servlib/bundling/BPQBlockProcessor.cc Fri Aug 12 13:55:56 2011 +0100 @@ -151,11 +151,6 @@ return BP_FAIL; } - if ( !bpq_info->complete() ) { - log_err_p(LOG, "BPQ block is not complete"); - return BP_FAIL; - } - BPQBlock* bpq_block = new BPQBlock(bpq_info); //int length = bpq_block->length();