X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Fenv%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Fjaxb%2FJAXBData.java;h=a5f10e0ff0909d2a89fbb7c267dab0918f037405;hb=3a5ca081c75bfeaecae40684a2cf89126fb99164;hp=38977a35441fb4009035fc4a7589af192ff795d1;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git

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 38977a35..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
@@ -114,10 +114,11 @@ public final class JAXBData<T> implements Data<T>{
      * @throws APIException
      */
     public String asString(EnvJAXB env) throws APIException {
-        if(dataAsString!=null) {
+        if (dataAsString!=null) {
             return dataAsString;
         } else {
-            return dataAsString = stringifier.stringify(env, dataAsObject);
+        	dataAsString = stringifier.stringify(env, dataAsObject);
+            return dataAsString;
         }
     }
 
@@ -131,15 +132,16 @@ public final class JAXBData<T> implements Data<T>{
      */
     // @Override
     public String asString() throws APIException {
-        if(dataAsString!=null) {
+        if (dataAsString!=null) {
             return dataAsString;
         } else {
-            return dataAsString = stringifier.stringify(creatingEnv, dataAsObject,options);
+            dataAsString = stringifier.stringify(creatingEnv, dataAsObject,options);
+            return dataAsString;
         }
     }
     
     public Data<T> to(OutputStream os) throws APIException, IOException {
-        if(dataAsString!=null) {
+        if (dataAsString!=null) {
             os.write(dataAsString.getBytes());
         } else if (stringifier instanceof IOStringifier){
             ((IOStringifier<T>)stringifier).stringify(creatingEnv, dataAsObject, os, options);
@@ -153,7 +155,7 @@ public final class JAXBData<T> implements Data<T>{
 
     // @Override
     public JAXBData<T> to(Writer writer) throws APIException, IOException {
-        if(dataAsString!=null) {
+        if (dataAsString!=null) {
             writer.write(dataAsString);
         } else if (stringifier instanceof IOStringifier){
             ((IOStringifier<T>)stringifier).stringify(creatingEnv, dataAsObject, writer, options);
@@ -166,7 +168,7 @@ public final class JAXBData<T> implements Data<T>{
 
 
     public InputStream getInputStream() throws APIException {
-        if(dataAsString==null) {
+        if (dataAsString==null) {
             dataAsString = stringifier.stringify(creatingEnv,dataAsObject,options);
         }
         return new ByteArrayInputStream(dataAsString.getBytes());
@@ -184,7 +186,7 @@ public final class JAXBData<T> implements Data<T>{
      */
 
     public T asObject(EnvJAXB env) throws APIException {
-        if(dataAsObject !=null) {
+        if (dataAsObject !=null) {
             return dataAsObject;
         } else {
             // Some Java compilers need two statements here
@@ -204,7 +206,7 @@ public final class JAXBData<T> implements Data<T>{
      */
     // @Override
     public T asObject() throws APIException {
-        if(dataAsObject !=null) {
+        if (dataAsObject !=null) {
             return dataAsObject;
         } else {
             // Some Java compilers need two statements here
@@ -239,11 +241,12 @@ public final class JAXBData<T> implements Data<T>{
      */
     // @Override
     public String toString() {
-        if(dataAsString!=null) {
+        if (dataAsString!=null) {
             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();
             }
@@ -292,8 +295,8 @@ public final class JAXBData<T> implements Data<T>{
         int count;
         do {
             count = input.read(b);
-            if(count>0)output.write(b, 0, count);
-        } while(count>=0);
+            if (count>0)output.write(b, 0, count);
+        } while (count>=0);
     }