# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-11-26 16:17:50
# Node ID 6206bdd36545e90696c6673bbf0994fc81900795
# Parent  a90c6294f82930ffc1404295ccc6ccbe38e966c5

jsonalchemy: fix a case when default is not set and parsinge exception happens.

before: default could be undefined and raised an error.

diff --git a/rhodecode/lib/jsonalchemy.py b/rhodecode/lib/jsonalchemy.py
--- a/rhodecode/lib/jsonalchemy.py
+++ b/rhodecode/lib/jsonalchemy.py
@@ -83,7 +83,7 @@ class JSONEncodedObj(sqlalchemy.types.Ty
             try:
                 value = json.loads(value, object_pairs_hook=DictClass)
             except Exception as e:
-                if self.safe:
+                if self.safe and self.default is not None:
                     return self.default()
                 else:
                     raise