X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Foauth%2FTokenClientFactory.java;h=e52df96198923ec93a5f9ad82b7768b369f7eb65;hb=3b9ce9945feec3b7f81860045931da4601b4891b;hp=3f6fa5998028b5432584c1774af439271a0662c9;hpb=8c6365116711469c74436141d63f046ef88b9023;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
index 3f6fa599..e52df961 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
@@ -158,10 +158,8 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
 		if(locatorURL==null) {
 			throw new LocatorException("Cannot have a null locatorURL in bestLocator");
 		}
-		if(locatePattern.matcher(locatorURL).matches()) {
+		if(locatorURL.startsWith("https://AAF_LOCATE_URL/") || locatePattern.matcher(locatorURL).matches()) {
 			return new AAFLocator(hsi,new URI(locatorURL));
-		} else if(locatorURL.contains("//DME2RESOLVE/")) {
-			throw new LocatorException("DME2Locator doesn't exist.  Use DME2 specific Clients");
 		} else {
 			return new PropertyLocator(locatorURL);
 		}