Fixed empty list bug

cgueret · May 16, 2012 · a5a6ff2 · a5a6ff2
1 parent 1807eb2
commit a5a6ff2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/server/IDSWrapper/src/uk/ac/ids/linker/Linker.java b/server/IDSWrapper/src/uk/ac/ids/linker/Linker.java
@@ -73,11 +73,12 @@ private List<Reference> getFromCache(LinkerParameters parameters) throws EntityN
 			throw new EntityNotFoundException(null);
 
 		// De-serialize the data
+		List<Reference> results = new ArrayList<Reference>();
 		@SuppressWarnings("unchecked")
 		List<String> uris = (List<String>) entity.getProperty(RESOURCE_PROPERTY);
-		List<Reference> results = new ArrayList<Reference>();
-		for (String uri : uris)
-			results.add(new Reference(uri));
+		if (uris != null)
+			for (String uri : uris)
+				results.add(new Reference(uri));
 		return results;
 	}
 

diff --git a/server/IDSWrapper/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar b/server/IDSWrapper/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar
diff --git a/server/IDSWrapper/war/WEB-INF/lib/appengine-api-labs-1.6.4.jar b/server/IDSWrapper/war/WEB-INF/lib/appengine-api-labs-1.6.4.jar
diff --git a/server/IDSWrapper/war/WEB-INF/lib/appengine-jsr107cache-1.6.4.jar b/server/IDSWrapper/war/WEB-INF/lib/appengine-jsr107cache-1.6.4.jar