zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-928340 into lp:zorba.

Requested reviews:
  Paul J. Lucas (paul-lucas)
  William Candillon (wcandillon)
Related bugs:
  Bug #928340 in Zorba: "Full-Text Assertion failed"
  https://bugs.launchpad.net/zorba/+bug/928340

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-928340/+merge/91924

Simple fix.
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-928340/+merge/91924
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/runtime/full_text/apply.cpp'
--- src/runtime/full_text/apply.cpp	2011-10-21 01:51:42 +0000
+++ src/runtime/full_text/apply.cpp	2012-02-07 21:47:20 +0000
@@ -1219,7 +1219,8 @@
   internal::Thesaurus::ptr thesaurus(
     dynamic_cast<internal::Thesaurus*>( rsrc.release() )
   );
-  ZORBA_ASSERT( thesaurus );
+  if ( !thesaurus )
+    throw XQUERY_EXCEPTION( err::FTST0018, ERROR_PARAMS( uri ) );
 
   internal::Thesaurus::iterator::ptr tresult(
     thesaurus->lookup(