summaryrefslogtreecommitdiffstats
path: root/catalog-model/src/main
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-08-07 07:05:40 +0300
committerMichael Lando <ml636r@att.com>2017-08-07 07:05:40 +0300
commitb2c60183d5d654b945a24ec5564807e4f691c6e8 (patch)
treed6cdc354fa7ce27ea1e0ce60e6c57aa7c1ef20b6 /catalog-model/src/main
parentd1d771bed17c6a5beea19af8da0bf9113972f25a (diff)
[SDC] code sync
Change-Id: I576dd69504722c341b0f41a1f6232ed3f4bee8df Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-model/src/main')
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java2
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverter.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java
index b8d8cb39de..07c2f8d51c 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java
@@ -269,6 +269,8 @@ public class ArtifactsOperations extends BaseOperation {
} else {
updateVersionAndDate(artifactData, oldVesrion);
}
+ long time = System.currentTimeMillis();
+ artifactData.setHeatParamsUpdateDate(time);
break;
case HEAT:
case HEAT_NET:
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverter.java
index c8fac11b3a..3f2b6eabf7 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverter.java
@@ -45,7 +45,6 @@ public class HeatStringConverter implements PropertyValueConverter {
coverted = ValidationUtils.normaliseWhitespace(coverted);
coverted = ValidationUtils.stripOctets(coverted);
coverted = ValidationUtils.removeHtmlTagsOnly(coverted);
- coverted = coverted.replaceAll("\"", "").replaceAll("\'", "");
}
return coverted;
}