summaryrefslogtreecommitdiffstats
path: root/misc/env
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-12-03 12:40:26 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-03 12:40:26 +0000
commit7e27616ebe3e3770163241076f87bbfa63c25b07 (patch)
treee16c5ec9008c0b88dbb81b081a6ce7f0ea9fd742 /misc/env
parent488d383a56cd503e3b4d3508640693d5c8e0d335 (diff)
parent3a5ca081c75bfeaecae40684a2cf89126fb99164 (diff)
Merge "JAXBData.java-Extract the assignment out of expression"
Diffstat (limited to 'misc/env')
-rw-r--r--misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java
index 6d83aca4..a5f10e0f 100644
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBData.java
@@ -117,7 +117,8 @@ public final class JAXBData<T> implements Data<T>{
if (dataAsString!=null) {
return dataAsString;
} else {
- return dataAsString = stringifier.stringify(env, dataAsObject);
+ dataAsString = stringifier.stringify(env, dataAsObject);
+ return dataAsString;
}
}
@@ -134,7 +135,8 @@ public final class JAXBData<T> implements Data<T>{
if (dataAsString!=null) {
return dataAsString;
} else {
- return dataAsString = stringifier.stringify(creatingEnv, dataAsObject,options);
+ dataAsString = stringifier.stringify(creatingEnv, dataAsObject,options);
+ return dataAsString;
}
}
@@ -243,7 +245,8 @@ public final class JAXBData<T> implements Data<T>{
return dataAsString;
} else {
try {
- return dataAsString = stringifier.stringify(creatingEnv, dataAsObject);
+ dataAsString = stringifier.stringify(creatingEnv, dataAsObject);
+ return dataAsString;
} catch (APIException e) {
return "ERROR - Can't Stringify from Object " + e.getLocalizedMessage();
}