Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Jul 22, 2014 · 1d92a04 · 1d92a04
2 parents 0edccd0 + 27f6aaa
commit 1d92a04
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
@@ -162,7 +162,7 @@ public TaskDto(TaskType taskType, ModelService modelService, TaskService taskSer
     private void fillInResourceReference(TaskType task, TaskManager manager, OperationResult result, ModelService service){
         ObjectReferenceType ref = task.getObjectRef();
 
-        if(ResourceType.COMPLEX_TYPE.equals(ref.getType())){
+        if(ref != null && ResourceType.COMPLEX_TYPE.equals(ref.getType())){
             resourceRef = new TaskAddResourcesDto(ref.getOid(), getTaskObjectName(task, manager, service, result));
         }
     }