import fix, type

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1599391 13f79535-47bb-0310-9956-ffa450edef68