diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch b/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch index 7c55b6a1b87..ad65be7f6f2 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch @@ -1,60 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index 20b80687301..5da7bfba9ec 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -1,74 +1,75 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch index cedd1dcfc01..f47a394bbf0 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch @@ -1,73 +1,73 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/WindStatusServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/WindStatusServlet.java index c73d876d040..b91ee6978fc 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/WindStatusServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/WindStatusServlet.java @@ -39,6 +39,8 @@ import com.sap.sailing.server.gateway.SailingServerHttpServlet; public class WindStatusServlet extends SailingServerHttpServlet implements IgtimiWindListener, BulkFixReceiver { private static final long serialVersionUID = -6791613843435003810L; + private static final String PARAM_RELOAD_WIND_RECEIVER="reloadWindReceiver"; + private final int NUMBER_OF_MESSAGES_TO_SHOW=20; private static List lastExpeditionMessages; @@ -58,15 +60,24 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim isIgtimiListenerRegistered = false; } - private void initializeWindReceiver() { + private void initializeWindReceiver(boolean reinitialize) { synchronized (lock) { - if (!isExpeditionListenerRegistered) { + if (!isExpeditionListenerRegistered || reinitialize) { isExpeditionListenerRegistered = registerExpeditionListener(); lastExpeditionMessages = new ArrayList(); } } synchronized (lock) { - if (!isIgtimiListenerRegistered) { + if (!isIgtimiListenerRegistered || reinitialize) { + if (reinitialize) { + try { + if (liveDataConnection != null) { + liveDataConnection.stop(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } isIgtimiListenerRegistered = registerIgtimiListener(); lastIgtimiMessages = new ArrayList(); igtimiRawMessageCount = 0; @@ -76,17 +87,17 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - initializeWindReceiver(); + String reinitializeWindReceiverParameter = req.getParameter(PARAM_RELOAD_WIND_RECEIVER); + initializeWindReceiver(reinitializeWindReceiverParameter != null && reinitializeWindReceiverParameter.equalsIgnoreCase("true")); resp.setContentType("text/html"); - PrintWriter out = resp.getWriter(); - out.println(""); out.println(""); out.println("Wind Status"); - out.println(""); + out.println(""); out.println(""); out.println(""); + out.println("

Reload wind connectors with parameter reloadWindReceiver=true. This will force a connection reset and a reloading of the wind receivers.

"); out.println("

Igtimi Wind Status ("+igtimiRawMessageCount+" raw messages received)

"); if (lastIgtimiMessages != null && !lastIgtimiMessages.isEmpty()) { final List copyOfLastIgtimiMessages; diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch index c6d811cc89b..421607982ce 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch @@ -1,31 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sse.security.ui/Security UI sdm.launch b/java/com.sap.sse.security.ui/Security UI sdm.launch index f967b09ab2b..ac873615635 100644 --- a/java/com.sap.sse.security.ui/Security UI sdm.launch +++ b/java/com.sap.sse.security.ui/Security UI sdm.launch @@ -44,5 +44,5 @@ - +