[midPoint-git] [Evolveum/midpoint] 5f5362: Fixing NPE in object merge code (MID-3460)

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 5f5362ad27a9d88fb4ed36fdf0866bfe4634bc7b
      https://github.com/Evolveum/midpoint/commit/5f5362ad27a9d88fb4ed36fdf0866bfe4634bc7b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java

  Log Message:
  -----------
  Fixing NPE in object merge code (MID-3460)