You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/22 18:59:59 UTC
[isis] branch master updated: ISIS-2158: just adds another debug
logline
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new a7054ea ISIS-2158: just adds another debug logline
a7054ea is described below
commit a7054ea56023067b0367fee3f21a452fe63c1197
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 22 19:59:49 2020 +0100
ISIS-2158: just adds another debug logline
---
.../diagnostics/IsisLogOnExceptionFilter.java | 23 ++++------------------
.../viewer/wicket/ui/pages/entity/EntityPage.java | 4 +++-
.../services/mementos/ObjectMementoLegacy.java | 4 +++-
3 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
index 24bc269..57e1375 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
@@ -28,6 +28,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import lombok.val;
//import org.springframework.beans.factory.annotation.Autowired;
//
//import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
@@ -60,7 +61,9 @@ public class IsisLogOnExceptionFilter implements Filter {
} catch (Exception ex) {
if(ex instanceof IOException) {
- if(((HttpServletRequest) request).getRequestURL().toString().endsWith(".css")) {
+ val url = ((HttpServletRequest) request).getRequestURL().toString();
+ if(url.endsWith(".css")
+ || url.endsWith(".woff2")) {
throw ex; // don't log
}
}
@@ -71,29 +74,11 @@ public class IsisLogOnExceptionFilter implements Filter {
logRequestUrl(request, ex);
}
-// val recognition = exceptionRecognizerService.recognize(ex, Can.ofSingleton(connectionAbortRecognizer));
-//
-// if(recognition.isPresent()) {
-// log.error(recognition.get().toMessage(null), ex);
-// // swallow exception
-// return;
-// }
-
throw ex;
}
}
// -- HELPER
-
-// private final static ExceptionRecognizerForType connectionAbortRecognizer =
-// new ExceptionRecognizerForType(IOException.class, originalMsg->{
-// if(originalMsg!=null
-// && originalMsg.contains("connection")
-// && originalMsg.contains("aborted")) {
-// return "client connection was aborted";
-// }
-// return null;
-// });
private static void logRequestUrl(ServletRequest request, Exception e) {
if(!(request instanceof HttpServletRequest)) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index c28e0e8..f94f7a6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -38,6 +38,7 @@ import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -48,14 +49,15 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.Breadcrum
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Web page representing an entity.
*/
@AuthorizeInstantiation("org.apache.isis.viewer.wicket.roles.USER")
+@Log4j2
public class EntityPage extends PageAbstract {
private static final long serialVersionUID = 144368606134796079L;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
index 1b0f797..b76ba0a 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoLegacy.java
@@ -41,8 +41,9 @@ import static org.apache.isis.core.commons.internal.base._With.requires;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
-
+@Log4j2
final class ObjectMementoLegacy implements Serializable {
private static final long serialVersionUID = 1L;
@@ -220,6 +221,7 @@ final class ObjectMementoLegacy implements Serializable {
RootOid rootOid = Oid.unmarshaller().unmarshal(memento.persistentOidStr, RootOid.class);
try {
+ log.debug("lookup by rootOid [{}]", rootOid);
return ManagedObject._adapterOfRootOid(specificationLoader, rootOid);
} finally {