Merge "AAF-892- move the variable to follow rules"

diff --combined cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
index 26aa98c,6e11c3c..9f4b4b9
--- 1/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
--- 2/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
@@@ -3,6 -3,8 +3,8 @@@
   * org.onap.aaf
   * ===========================================================================
   * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+  * 
+  * Modifications Copyright (C) 2018 IBM.
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -21,14 -23,12 +23,14 @@@
  
  package org.onap.aaf.cadi;
  
 +import java.io.ByteArrayOutputStream;
  import java.io.File;
  import java.io.FileInputStream;
  import java.io.IOException;
  import java.io.InputStream;
  import java.io.PrintStream;
  import java.io.PrintWriter;
 +import java.io.StringBufferInputStream;
  import java.io.StringWriter;
  import java.text.DateFormat;
  import java.text.SimpleDateFormat;
@@@ -45,6 -45,7 +47,7 @@@ import org.onap.aaf.cadi.util.Split
  public class PropAccess implements Access {
      // Sonar says cannot be static... it's ok.  not too many PropAccesses created.
      private final SimpleDateFormat iso8601 = newISO8601();
+     private Symm symm;
                
      public static SimpleDateFormat newISO8601() {
        return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
@@@ -52,7 -53,7 +55,7 @@@
  
      public static final Level DEFAULT = Level.AUDIT;
      
-     private Symm symm;
+     
      private int level;
      private Properties props;
      private List<String> recursionProtection = null;
@@@ -305,11 -306,6 +308,11 @@@
              if (o!=null) {
                if(o.getClass().isArray()) {
                        first = write(first,sb,(Object[])o);
 +              } else if(o instanceof Throwable) {
 +                      ByteArrayOutputStream baos = new ByteArrayOutputStream();
 +                      PrintStream ps = new PrintStream(baos);
 +                      ((Throwable)o).printStackTrace(ps);
 +                      sb.append(baos.toString());
                } else {
                        s=o.toString();
                        if (first) {