Merge pull request #1001 from sinthuja/test-merge

Fixing https://github.com/wso2/product-iots/issues/1000.

modules/distribution/src/core/bin/analytics.sh

@@ -61,10 +61,6 @@ ANALYTICS_INIT_SCRIPT="$CARBON_HOME/wso2/analytics/bin/wso2server.sh"
 
 # If the daemon is not there, then exit.
 
-sh $ANALYTICS_INIT_SCRIPT $* &
+$ANALYTICS_INIT_SCRIPT $*
+exit;
 
-trap "sh $ANALYTICS_INIT_SCRIPT stop; exit;" INT TERM
-while :
-do
-        sleep 60
-done

modules/distribution/src/core/bin/broker.sh

@@ -61,10 +61,5 @@ BROKER_INIT_SCRIPT="$CARBON_HOME/wso2/broker/bin/wso2server.sh"
 
 # If the daemon is not there, then exit.
 
-sh $BROKER_INIT_SCRIPT $* &
+$BROKER_INIT_SCRIPT $*
-
+exit;
-trap "sh $BROKER_INIT_SCRIPT stop; exit;" INT TERM
-while :
-do
-        sleep 60
-done