Merge pull request #120 from ayyoob/das-ext

Few fixes after testing
application-manager-new
Ruwan 9 years ago
commit 8b10e550ef

@ -47,10 +47,6 @@
<artifactId>org.wso2.carbon.event.output.adapter.extensions.ui</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.extensions.ui</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents.wso2</groupId>
<artifactId>httpcore</artifactId>
</dependency>
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId> <artifactId>javax.ws.rs-api</artifactId>

@ -343,13 +343,14 @@ public class UIEventAdapter implements OutputEventAdapter {
// get all subscribed web-socket sessions. // get all subscribed web-socket sessions.
CopyOnWriteArrayList<CEPWebSocketSession> cepWebSocketSessions = CopyOnWriteArrayList<CEPWebSocketSession> cepWebSocketSessions =
uiOutputCallbackControllerServiceImpl.getSessions(tenantId, streamId); uiOutputCallbackControllerServiceImpl.getSessions(tenantId, streamId);
if (cepWebSocketSessions != null) {
for (CEPWebSocketSession cepWebSocketSession : cepWebSocketSessions) { for (CEPWebSocketSession cepWebSocketSession : cepWebSocketSessions) {
boolean isValidSession = validateEventAgainstSessionFilters(event, cepWebSocketSession); boolean isValidSession = validateEventAgainstSessionFilters(event, cepWebSocketSession);
if (isValidSession) { if (isValidSession) {
validSessions.add(cepWebSocketSession); validSessions.add(cepWebSocketSession);
} }
} }
}
return validSessions; return validSessions;
} }

@ -693,7 +693,7 @@
org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.server.feature:${carbon.event-processing.version} org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.feature:${carbon.event-processing.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.tracer.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.tracer.feature:${carbon.analytics.common.version}
@ -1499,7 +1499,7 @@
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.processor.server.feature.group</id> <id>org.wso2.carbon.event.processor.feature.group</id>
<version>${carbon.event-processing.version}</version> <version>${carbon.event-processing.version}</version>
</feature> </feature>
<feature> <feature>

Loading…
Cancel
Save