Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: fa200798 by Tony CHEMIT at 2018-10-14T10:09:19Z Connexion HTTP probablement périmée - Closes #1141 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java ===================================== @@ -112,9 +112,7 @@ public class ContentUIManager { UIHelper.handlingError(e); withError = true; } finally { - if (withError) { - close(); - } else { + if (!withError) { getLayoutContent().removeAll(); getLayoutContent().add(content, BorderLayout.CENTER); getMainUI().getHandler().updateContentSize(); ===================================== client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== @@ -35,6 +35,7 @@ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.services.security.InvalidAuthenticationTokenException; +import io.ultreia.java4all.http.HResponseErrorException; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; @@ -561,7 +562,9 @@ public class UIHelper extends SwingUtil { if (type.isInstance(e)) { return true; } - + if (e instanceof HResponseErrorException) { + return containsExceptionInStack(((HResponseErrorException) e).getError().getException(), type); + } while (e.getCause() != null) { e = e.getCause(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa200798150308b23339d8f237ae... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa200798150308b23339d8f237ae... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT