diff options
author | Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-05-14 17:19:51 -0400 |
---|---|---|
committer | Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-05-25 13:39:38 -0400 |
commit | 2845910b34682056c1949f82e39d9205a26554e9 (patch) | |
tree | 825474a899dc5783e6ea8c4aefd26b6d4c881dfd /ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller | |
parent | 485296388748c1efb5737cf7ae9d4a8254681552 (diff) |
Bulk upload changes and music health check apis
Issue-ID: PORTAL-290, PORTAL-291
Bulk upload changes and music health check apis
Change-Id: I63d289d75420658ff4a14385a5106838fa8c32b2
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller')
-rw-r--r-- | ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java | 1 | ||||
-rw-r--r-- | ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/PeerBroadcastSocket.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java index 13ea316c..26564a04 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java @@ -80,6 +80,7 @@ public class ONAPWelcomeController extends EPRestrictedBaseController{ this.viewName = viewName; } + // TODO Need to revisit this as its conflicting with Spring Security; check web.xml's oid-context.xml config //@Resource(name = "namedAdmins") private Set<SubjectIssuerGrantedAuthority> admins; diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/PeerBroadcastSocket.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/PeerBroadcastSocket.java index 8f7ffc65..efad3c68 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/PeerBroadcastSocket.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/PeerBroadcastSocket.java @@ -82,12 +82,12 @@ public class PeerBroadcastSocket { if (to == null) return; Object toSessionObj = channelMap.get(to); - if (toSessionObj != null) { + /*if (toSessionObj != null) { Session toSession = null; toSession = (Session) toSessionObj; toSession.getBasicRemote().sendText(message); } - +*/ } catch (Exception ex) { logger.error(EELFLoggerDelegate.errorLogger, "Failed to send text" + ex.getMessage()); } |