Isolate a branch-dependant import.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK8@1615111 13f79535-47bb-0310-9956-ffa450edef68
Fixed a NullPointerException.

git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK8@1615131 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK8 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1615133 13f79535-47bb-0310-9956-ffa450edef68