Avoid stringification of tool state root dictionary

This commit is contained in:
guerler
2017-02-01 17:43:05 -05:00
parent bb318d36e6
commit 417d119df9
2 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -322,7 +322,7 @@ class DefaultToolState( object ):
value = params_to_strings( tool.inputs, self.inputs, app )
value["__page__"] = self.page
value["__rerun_remap_job_id__"] = self.rerun_remap_job_id
return json.dumps( value )
return value
def decode( self, values, tool, app ):
"""
+2 -3
View File
@@ -787,9 +787,8 @@ class ToolModule( WorkflowModule ):
"""
if self.tool:
state = super( ToolModule, self ).decode_runtime_state( runtime_state )
state_dict = loads( runtime_state )
if RUNTIME_STEP_META_STATE_KEY in state_dict:
self.__restore_step_meta_runtime_state( loads( state_dict[ RUNTIME_STEP_META_STATE_KEY ] ) )
if RUNTIME_STEP_META_STATE_KEY in runtime_state:
self.__restore_step_meta_runtime_state( loads( runtime_state[ RUNTIME_STEP_META_STATE_KEY ] ) )
return state
else:
raise ToolMissingException( "Tool %s missing. Cannot recover runtime state." % self.tool_id )