Merge pull request #70 from justinhrobbins/feature_60

closes #60
justinhrobbins · Jan 5, 2014 · fd6d4fe · fd6d4fe
2 parents cf36441 + 8460d3a
commit fd6d4fe
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/...ards_Service/src/main/java/org/robbins/flashcards/facade/base/AbstractCrudFacadeImpl.java b/...ards_Service/src/main/java/org/robbins/flashcards/facade/base/AbstractCrudFacadeImpl.java
@@ -102,6 +102,8 @@ public D findOne(Long id) throws ServiceException {
 	public D findOne(Long id, Set<String> fields) throws ServiceException {
 		E resultEntity = getService().findOne(id);
 
+		if (resultEntity == null) return null; 
+
 		if (CollectionUtils.isNotEmpty(fields)) {
 			fieldInitializer.initializeEntity(resultEntity, fields);
 		}