Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
fa200798
by Tony CHEMIT at 2018-10-14T10:09:19Z
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:
| ... | ... | @@ -112,9 +112,7 @@ public class ContentUIManager { |
| 112 | 112 |
UIHelper.handlingError(e);
|
| 113 | 113 |
withError = true;
|
| 114 | 114 |
} finally {
|
| 115 |
- if (withError) {
|
|
| 116 |
- close();
|
|
| 117 |
- } else {
|
|
| 115 |
+ if (!withError) {
|
|
| 118 | 116 |
getLayoutContent().removeAll();
|
| 119 | 117 |
getLayoutContent().add(content, BorderLayout.CENTER);
|
| 120 | 118 |
getMainUI().getHandler().updateContentSize();
|
| ... | ... | @@ -35,6 +35,7 @@ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; |
| 35 | 35 |
import fr.ird.observe.dto.reference.DataDtoReference;
|
| 36 | 36 |
import fr.ird.observe.dto.reference.ReferentialDtoReference;
|
| 37 | 37 |
import fr.ird.observe.services.security.InvalidAuthenticationTokenException;
|
| 38 |
+import io.ultreia.java4all.http.HResponseErrorException;
|
|
| 38 | 39 |
import org.apache.commons.beanutils.PropertyUtils;
|
| 39 | 40 |
import org.apache.commons.io.FileUtils;
|
| 40 | 41 |
import org.apache.logging.log4j.LogManager;
|
| ... | ... | @@ -561,7 +562,9 @@ public class UIHelper extends SwingUtil { |
| 561 | 562 |
if (type.isInstance(e)) {
|
| 562 | 563 |
return true;
|
| 563 | 564 |
}
|
| 564 |
- |
|
| 565 |
+ if (e instanceof HResponseErrorException) {
|
|
| 566 |
+ return containsExceptionInStack(((HResponseErrorException) e).getError().getException(), type);
|
|
| 567 |
+ }
|
|
| 565 | 568 |
while (e.getCause() != null) {
|
| 566 | 569 |
e = e.getCause();
|
| 567 | 570 |
|