Fixed properties merge logic not to lose properties from inputs 87/86387/3
authorSatoshi Fujii <fujii-satoshi@jp.fujitsu.com>
Fri, 26 Apr 2019 11:00:07 +0000 (20:00 +0900)
committerOfir Sonsino <ofir.sonsino@intl.att.com>
Wed, 8 May 2019 14:52:59 +0000 (14:52 +0000)
commit0da3e7d52c83b54b126dd52f23da3bb94e152fba
tree109c0dfc595e979576fcab5ec3c38d852cc3a54d
parentfaaad99b7304d2d0901c282e7597acc453a77655
Fixed properties merge logic not to lose properties from inputs

Change-Id: I9dbc244c667272062bc4de90d616ea1c5458ed0a
Issue-ID: SDC-2255
Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java