← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

 

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

Commit message:
Removed wrong assert() for invalid XML.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/180658

Removed wrong assert() for invalid XML.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/180658
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/json/snelson.cpp'
--- src/runtime/json/snelson.cpp	2013-07-29 23:55:03 +0000
+++ src/runtime/json/snelson.cpp	2013-08-16 21:39:43 +0000
@@ -291,11 +291,10 @@
     else if ( ::strcmp( required_name, "pair" ) == 0 )
       parent_type = "object";
     else
-      ZORBA_ASSERT( false );
-    throw XQUERY_EXCEPTION(
-      zerr::ZJSE0004_BAD_NODE,
-      ERROR_PARAMS( element_name, parent_type, required_name )
-    );
+      throw XQUERY_EXCEPTION(
+        zerr::ZJSE0004_BAD_NODE,
+        ERROR_PARAMS( element_name, parent_type, required_name )
+      );
   }
 }
 


References