lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Lock is only needed when BulkUpload

Browse Source 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-08-11 13:54:28 +02:00
parent 3ec569f259
commit 6205126279
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java
View File

@@ -23,7 +23,6 @@ import com.vaadin.server.DefaultErrorHandler;
import com.vaadin.server.ErrorEvent; import com.vaadin.server.ErrorEvent;
import com.vaadin.server.Page; import com.vaadin.server.Page;
import com.vaadin.shared.Connector; import com.vaadin.shared.Connector;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
import com.vaadin.ui.Notification.Type; import com.vaadin.ui.Notification.Type;
import com.vaadin.ui.UI; import com.vaadin.ui.UI;
@@ -47,16 +46,14 @@ public class HawkbitUIErrorHandler extends DefaultErrorHandler {
if (originError.isPresent()) { if (originError.isPresent()) {
final Connector connector = ((ConnectorErrorEvent) event).getConnector(); final Connector connector = ((ConnectorErrorEvent) event).getConnector();
// in case of BulkUpload // in case of BulkUpload: BulkUpload needs a look to show the
// notification
if (connector instanceof UI) { if (connector instanceof UI) {
((UI) (((ConnectorErrorEvent) event).getConnector())).access(() -> message.show(originError.get())); ((UI) (((ConnectorErrorEvent) event).getConnector())).access(() -> message.show(originError.get()));
return; return;
} }
// Other UI components message.show(originError.get());
if (connector instanceof AbstractComponent) { return;
((AbstractComponent) connector).getUI().access(() -> message.show(originError.get()));
return;
}
} }
// Default // Default
HawkbitErrorNotificationMessage.show(message.getCaption(), message.getDescription(), Type.HUMANIZED_MESSAGE); HawkbitErrorNotificationMessage.show(message.getCaption(), message.getDescription(), Type.HUMANIZED_MESSAGE);