X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Frserv%2FMatch.java;fp=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Frserv%2FMatch.java;h=41e3c5db65425b93392c1d11606231de5d029b4a;hp=8f47126fb32685ca5b63f1728b4b6c5adba98050;hb=82755753f41112e1cdd91b2994620ad074dfbf20;hpb=e78d297795f08d3ecdc176ff10c6c77570828e17

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Match.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Match.java
index 8f47126f..41e3c5db 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Match.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Match.java
@@ -35,8 +35,8 @@ import java.util.Set;
  */
 public class Match {
     private Map<String, Integer> params;
-    private byte[]     values[];
-    private Integer vars[];
+    private byte[][] values;
+    private Integer[] vars;
     private boolean wildcard;
 
 
@@ -50,7 +50,6 @@ public class Match {
      * a multi-field option, i.e. ending with a wild-card.
      */
     public Match(String path) {
-        // IF DEBUG: System.out.print("\n[" + path + "]");
         params = new HashMap<>();
         if (path!=null) {
             String[] pa = path.split("/");
@@ -87,7 +86,6 @@ public class Match {
                             vars[i]=0; // this is actually a variable, if it only contains a "*"
                         }
                     }
-                    // vars[i]=null;
                 }
             }
         }
@@ -148,8 +146,7 @@ public class Match {
 
         int lastField = values.length;
         int lastByte = pabytes.length;
-        boolean fieldMatched = false; // = lastByte>0?(pabytes[0]=='/'):false;
-        // IF DEBUG: System.out.println("\n -- " + path + " --");
+        boolean fieldMatched = false;
         for (int i=0;rv && i<lastByte;++i) {
             if (field>=lastField) { // checking here allows there to be a non-functional ending /
                 rv = false;
@@ -163,7 +160,6 @@ public class Match {
                 if (end==0)end=start+1;
                 int k = i;
                 for (int j=start; j<end && k<lastByte; ++k) {
-                    // IF DEBUG: System.out.print((char)pabytes[k]);
                     if (pabytes[k]=='/') {
                         ++field;
                         ++j;
@@ -175,7 +171,6 @@ public class Match {
                 fieldMatched = false; // reset
                 fieldIdx = 0;
             } else {
-                // IF DEBUG: System.out.print((char)pabytes[i]);
                 if (pabytes[i]=='/') { // end of field, eval if Field is matched
                     // if double slash, check if supposed to be empty
                     if (fieldIdx==0 && values[field].length==0) {