[rhq-project/rhq] 9eebe5: Prevents NPE on mergeExistingResourcePluginConfigu...

[Josejulio Martínez]

  Branch: refs/heads/master
  Home:   https://github.com/rhq-project/rhq
  Commit: 9eebe59c027908068211dbd481ce4944c35894fb
      https://github.com/rhq-project/rhq/commit/9eebe59c027908068211dbd481ce494...
  Author: Ruben Vargas <ruben.vp8510(a)gmail.com&gt;
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java

  Log Message:
  -----------
  Prevents NPE on mergeExistingResourcePluginConfiguration when property definition
doesn't exist anymore.


  Commit: 2b98508cfc5238433f61fb0e7313a059910880fd
      https://github.com/rhq-project/rhq/commit/2b98508cfc5238433f61fb0e7313a05...
  Author: Josejulio Martínez <finwemartinez(a)gmail.com&gt;
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java

  Log Message:
  -----------
  Merge pull request #292 from rubenvp8510/npe-inventory-merged

Prevents NPE on mergeExistingResourcePluginConfiguration when property definition
doesn't exist anymore.


Compare: https://github.com/rhq-project/rhq/compare/a96f180a1f3d...2b98508cfc52