Merge change Ib1dd3235 into eclair-mr2

* changes:
  fix NPE. don't release an already released compiledSql obj