Merge branch 'hotfix-1.1.12'

Author: arteymix

pom.xml

@@ -5,7 +5,7 @@
 	<name>baseCode</name>
 	<groupId>baseCode</groupId>
 	<artifactId>baseCode</artifactId>
-	<version>1.1.11</version>
+	<version>1.1.12</version>
 	<inceptionYear>2003</inceptionYear>
 	<description>
 		<![CDATA[Data structures, math and statistics tools, and utilities that are often needed across projects.]]>
@@ -402,16 +402,6 @@
 				<artifactId>maven-site-plugin</artifactId>
 				<version>3.9.1</version>
 			</plugin>
-			<plugin>
-				<!-- used when running cobertura outside of the 'site' plugin call. -->
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<outputDirectory>${cobertura.outputDirectory}</outputDirectory>
-					<check/>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -490,17 +480,6 @@
 					<targetJdk>1.7</targetJdk>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<!-- seems we need something here when running 'mvn site' -->
-					<check>
-						<haltOnFailure>false</haltOnFailure>
-					</check>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jdepend-maven-plugin</artifactId>

src/ubic/basecode/ontology/providers/AbstractOntologyService.java

@@ -466,8 +466,8 @@ private void initSearchByAlternativeId() {
     private OntologyTerm getTermInternal( String uri ) {
         return termCache.computeIfAbsent( uri, u -> {
             OntClass ontCls = model.getOntClass( u );
-            // bnode
-            if ( ontCls.getURI() == null ) {
+            // null or bnode
+            if ( ontCls == null || ontCls.getURI() == null ) {
                 return null;
             }
             return new OntologyTermImpl( ontCls );