[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1010311 into lp:zorba

2012-06-08 Thread noreply 
The proposal to merge lp:~paul-lucas/zorba/bug-1010311 into lp:zorba has been 
updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1010311/+merge/109275
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1010311/+merge/109275
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1010311 into lp:zorba

2012-06-08 Thread Zorba Build Bot 
Validation queue job bug-1010311-2012-06-08T15-04-10.619Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1010311/+merge/109275
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1010311 into lp:zorba

2012-06-08 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1010311-2012-06-08T15-04-10.619Z/log.html
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1010311/+merge/109275
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1010311 into lp:zorba

2012-06-08 Thread Matthias Brantner 
The proposal to merge lp:~paul-lucas/zorba/bug-1010311 into lp:zorba has been 
updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1010311/+merge/109275
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1010311/+merge/109275
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1010311 into lp:zorba

2012-06-08 Thread Matthias Brantner 
Review: Approve


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

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1010311 into lp:zorba

2012-06-07 Thread Paul J. Lucas 
Review: Approve


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

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1010311 into lp:zorba

2012-06-07 Thread Paul J. Lucas 
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-1010311 into 
lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #1010311 in Zorba: "ft:thesaurus-lookup() on a non-existant word fails 
assertion"
  https://bugs.launchpad.net/zorba/+bug/1010311

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

s/ZORBA_ASSERT/if/
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1010311/+merge/109275
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp	2012-05-19 00:12:15 +
+++ src/runtime/full_text/ft_module_impl.cpp	2012-06-08 04:40:27 +
@@ -505,12 +505,11 @@
   state->phrase_, state->relationship_, state->at_least_, state->at_most_
 )
   );
-  ZORBA_ASSERT( state->tresult_.get() );
-
-  while ( state->tresult_->next( &synonym ) ) {
-GENV_ITEMFACTORY->createString( result, synonym );
-STACK_PUSH( true, state );
-  }
+  if ( state->tresult_ )
+while ( state->tresult_->next( &synonym ) ) {
+  GENV_ITEMFACTORY->createString( result, synonym );
+  STACK_PUSH( true, state );
+}
 
   STACK_END( state );
 }

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp