X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2FPermEval.java;h=3e8d6f97ec379f396831b8aae92fec263502fb11;hb=c353159903bf9c7f3f4426e66cad9af2c657fb1d;hp=498f1bf92addea71b5eab08699b92c0b92490788;hpb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java
index 498f1bf9..3e8d6f97 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java
@@ -30,7 +30,6 @@ public class PermEval {
     public static final char ALT_START_INST_KEY_CHAR='/';
 
     public static final char LIST_SEP = ',';
-    public static final String INST_KEY_REGEX = new StringBuilder().append(START_INST_KEY_CHAR).toString();
     public static final String ASTERIX = "*";
 
     /**
@@ -47,7 +46,7 @@ public class PermEval {
         if (sInst == null || pInst == null) {
             return false;
         }
-        if (sInst == "" || pInst == "") {
+        if (sInst.equals("") || pInst.equals("")) {
             return false;
         }
         if (ASTERIX.equals(sInst)) {
@@ -68,7 +67,7 @@ public class PermEval {
                     String[] pkeys=Split.split(startChar,pInst);
                     if (pkeys.length<skeys.length) {
                         return false;
-                    } else if(pkeys.length > skeys.length && 
+                    } else if(pkeys.length > skeys.length &&
                              (skeys.length==0 || !ASTERIX.equals(skeys[skeys.length-1]))) {
                            return false;
                     }
@@ -137,8 +136,8 @@ public class PermEval {
      * Action is not quite as complex.  But we write it in this function so it can be consistent
      */
     public static boolean evalAction(String sAction,String pAction) {
-        if (ASTERIX.equals(sAction))return true;               // If Server's String is "*", then it accepts every Action
-        if (pAction == "") return false;
+        if (ASTERIX.equals(sAction)) return true;               // If Server's String is "*", then it accepts every Action
+        if (pAction.equals("")) return false;
         for (String sItem : Split.split(LIST_SEP,sAction)) {         // allow for "," definition in Action
             if (pAction.charAt(0)==START_REGEX_CHAR?       // First char
                     sItem.matches(pAction.substring(1)):   // Evaluate as Regular Expression