Changeset 441

Timestamp:

08/30/10 16:05:59 (17 months ago)

Author:

martijn

Message:

Fixes NPE when calling xrefExists with null DataSource?

Location:

trunk

Files:

• benchmarking/test/org/bridgedb/benchmarking/Base.java (modified) (3 diffs)
• org.bridgedb.rdb/src/org/bridgedb/rdb/SimpleGdbImplCommon.java (modified) (1 diff)

trunk/benchmarking/test/org/bridgedb/benchmarking/Base.java

@@ -12 +12 @@
 import org.bridgedb.IDMapperException;
 import org.bridgedb.Xref;
+import org.bridgedb.bio.BioDataSource;
 
 import buildsystem.Measure;
@@ -20 +21 @@
 {
         static final Xref NONEXISTENT = new Xref("123", DataSource.getBySystemCode("??"));
+        static final Xref HALFNULL1 = new Xref("123", null);
+        static final Xref HALFNULL2 = new Xref(null, BioDataSource.ENTREZ_GENE);
         
         /**
@@ -47 +50 @@
                 // check that xrefexists doesn't lead to exception
                 assertFalse (mapper.xrefExists(NONEXISTENT));
+                assertFalse (mapper.xrefExists(HALFNULL1));
+                assertFalse (mapper.xrefExists(HALFNULL2));
                 assertTrue (mapper.xrefExists(from));
                 assertTrue (mapper.xrefExists(to));

trunk/org.bridgedb.rdb/src/org/bridgedb/rdb/SimpleGdbImplCommon.java

@@ -81 +81 @@
         public boolean xrefExists(Xref xref) throws IDMapperException 
         {
+                if (xref.getDataSource() == null) return false;
                 final QueryLifeCycle pst = qXrefExists;
                 synchronized (pst) {