Collection syntax change because of Sonar

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / wsse / XReader.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java b/cadi/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java
index 4e5048b..78265e4 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java
@@ -140,7 +140,7 @@ public class XReader {
                                                                                                                                                // scoping behavior when used with the Stack
                                                                        // drop through on purpose
                                                                case END_TAG:
-                                                                       ns = t.prefix==null?"":nss.get(t.prefix); // Get the namespace from prefix (if exists)
+                                                                       ns = t.prefix==null||nss==null?"":nss.get(t.prefix); // Get the namespace from prefix (if exists)
                                                                        break;
                                                                default:
                                                                        ns = "";
@@ -330,7 +330,9 @@ public class XReader {
                if(type==0) {
                        type=START_TAG;
                }
-               tag.state|=type;        // add the appropriate Tag States
+               if(tag!=null) {
+                       tag.state|=type;        // add the appropriate Tag States
+               }
                return tag;
        }
 
@@ -352,14 +354,22 @@ public class XReader {
                        for(Tag tag : t.attribs) {
                                if("xmlns".equals(tag.prefix)) {
                                        if(newnss==null) {
-                                               newnss = new HashMap<String,String>();
+                                               newnss = new HashMap<>();
                                                if(nss!=null)newnss.putAll(nss);
                                        }
                                        newnss.put(tag.name, tag.value);
                                }
                        }
                }
-               return newnss==null?(nss==null?new HashMap<String,String>():nss):newnss;
+               //return newnss==null?(nss==null?new HashMap<String,String>():nss):newnss;
+               if(newnss==null) {
+                       if(nss==null) {
+                               newnss = new HashMap<>();
+                       } else {
+                               newnss = nss;
+                       }
+               }
+               return newnss;
        }
 
        /**
@@ -390,7 +400,7 @@ public class XReader {
                 */
                public void add(Tag attrib) {
                        if(attribs == null) {
-                               attribs = new ArrayList<Tag>();
+                               attribs = new ArrayList<>();
                        }
                        attribs.add(attrib);
                }