diff options
| author |   Vijay <vv770d@att.com> | 2017-09-25 20:32:23 +0000 |
|---|---|---|
| committer | Vijay <vv770d@att.com> | 2017-09-25 20:32:48 +0000 |
| commit | f46b942de6b6ae6e9ede19a31c43c3e081fdc4e5 (patch) | |
| tree | ebc638bdec91f7c78b3db36e573c28ef14d4c668 /src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java | |
| parent | 86ac6e10c0caa05a9649d53b7179b3dcd8fbd802 (diff) | |
fix merge error n sonar items
https://jenkins.onap.org/job/dcaegen2-collectors-ves-master-merge-java/33/console
Change-Id: I90693665dcf650028186a47ed69eaf15bc2f0d15
Issue-ID:DCAEGEN2-82
Signed-off-by: Vijay <vv770d@att.com>
Diffstat (limited to 'src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java')
| -rw-r--r-- | src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java b/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java index fee9ce1c..a8bfc24e 100644 --- a/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java +++ b/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java @@ -47,21 +47,22 @@ import com.att.nsa.security.NsaAuthenticator; import com.att.nsa.security.authenticators.SimpleAuthenticator; import com.att.nsa.security.db.simple.NsaSimpleApiKey; + public class RestfulCollectorServlet extends CommonServlet { - String authid; - String authpwd; + String authid=null; + String authpwd=null; public String authlist; public RestfulCollectorServlet ( rrNvReadable settings ) throws loadException, missingReqdSetting { super ( settings, "collector", false ); - authid = settings.getString(CommonStartup.kSetting_authid,null); - if (authid != null) + //authid = settings.getString(CommonStartup.kSetting_authid,null); + /*if (authid != null) { String authpwdtemp = settings.getString(CommonStartup.kSetting_authpwd,null); authpwd = new String(Base64.decodeBase64(authpwdtemp)); - } + }*/ authlist = settings.getString(CommonStartup.kSetting_authlist,null); } @@ -158,4 +159,3 @@ public class RestfulCollectorServlet extends CommonServlet private static final long serialVersionUID = 1L; private static final Logger log = LoggerFactory.getLogger ( RestfulCollectorServlet.class ); } - |