X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Ffilter%2FMapBathConverter.java;h=62b458abfc1c9307b7890b1a6369b46258a5f61b;hp=7ad1921c2db4a947d28821bb46456c16430c4b07;hb=deb396a3d53a84b2eb5a46d40122b4902d72c601;hpb=eb706feab37842e2decc5ad9e634fb5689f85531

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java
index 7ad1921c..62b458ab 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java
@@ -29,14 +29,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.xml.ws.Holder;
-
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.Access.Level;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.Symm;
 import org.onap.aaf.cadi.util.CSV;
 import org.onap.aaf.cadi.util.CSV.Visitor;
+import org.onap.aaf.cadi.util.Holder;
 
 /**
  * This Filter is designed to help MIGRATE users from systems that don't match the FQI style.
@@ -119,7 +118,7 @@ public class MapBathConverter {
                 throw new CadiException("Invalid Authentication Credential for " + cred);
             }
             if(hpass!=null) {
-                hpass.value = cred.substring(colon+1);
+                hpass.set(cred.substring(colon+1));
             }
             return cred.substring(0, colon);
         } else {
@@ -144,7 +143,7 @@ public class MapBathConverter {
         Holder<String> hpass=null;
         try {
             if(bath.startsWith(BASIC)) {
-                cred = idFromBasic(bath,(hpass=new Holder<String>()));
+                cred = idFromBasic(bath,(hpass=new Holder<String>(null)));
                 if(rv==null) {
                     rv = map.get(cred);
                 }
@@ -161,7 +160,7 @@ public class MapBathConverter {
                 } else {
                     if(hpass!=null) {
                         tcred = rv;
-                        rv = BASIC + Symm.base64noSplit.encode(rv+':'+hpass.value);
+                        rv = BASIC + Symm.base64noSplit.encode(rv+':'+hpass.get());
                     }
                 }
                 if(tcred != null) {