Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "JAXBData.java-Extract the assignment out of expression"
[aaf/authz.git]
/
misc
/
env
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
misc
/
env
/
jaxb
/
JAXBData.java
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
6d83aca
..
a5f10e0
100644
(file)
--- 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) {
\r
return dataAsString;
\r
} else {
\r
if (dataAsString!=null) {
\r
return dataAsString;
\r
} else {
\r
- return dataAsString = stringifier.stringify(env, dataAsObject);
\r
+ dataAsString = stringifier.stringify(env, dataAsObject);
\r
+ return dataAsString;
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-134,7
+135,8
@@
public final class JAXBData<T> implements Data<T>{
if (dataAsString!=null) {
\r
return dataAsString;
\r
} else {
\r
if (dataAsString!=null) {
\r
return dataAsString;
\r
} else {
\r
- return dataAsString = stringifier.stringify(creatingEnv, dataAsObject,options);
\r
+ dataAsString = stringifier.stringify(creatingEnv, dataAsObject,options);
\r
+ return dataAsString;
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-243,7
+245,8
@@
public final class JAXBData<T> implements Data<T>{
return dataAsString;
\r
} else {
\r
try {
\r
return dataAsString;
\r
} else {
\r
try {
\r
- return dataAsString = stringifier.stringify(creatingEnv, dataAsObject);
\r
+ dataAsString = stringifier.stringify(creatingEnv, dataAsObject);
\r
+ return dataAsString;
\r
} catch (APIException e) {
\r
return "ERROR - Can't Stringify from Object " + e.getLocalizedMessage();
\r
}
\r
} catch (APIException e) {
\r
return "ERROR - Can't Stringify from Object " + e.getLocalizedMessage();
\r
}
\r