Adds logging and proper header with licence
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2b150d87 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2b150d87 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2b150d87 Branch: refs/heads/master Commit: 2b150d87759d08cde08aa90ab78d28946836c7f8 Parents: 7bce8ef Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Tue Dec 23 21:48:43 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Tue Dec 23 21:48:43 2014 +0100 ---------------------------------------------------------------------- .../struts2/sitemesh/StrutsSiteMeshFactory.java | 32 ++++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/2b150d87/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/StrutsSiteMeshFactory.java ---------------------------------------------------------------------- diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/StrutsSiteMeshFactory.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/StrutsSiteMeshFactory.java index 29eb052..96405fb 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/StrutsSiteMeshFactory.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/StrutsSiteMeshFactory.java @@ -1,15 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.struts2.sitemesh; import com.opensymphony.module.sitemesh.Config; import com.opensymphony.module.sitemesh.factory.DefaultFactory; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.commons.lang3.ObjectUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsStatics; - public class StrutsSiteMeshFactory extends DefaultFactory { + private static final Logger LOG = LoggerFactory.getLogger(StrutsSiteMeshFactory.class); + public StrutsSiteMeshFactory(Config config) { super(config); } @@ -23,9 +44,14 @@ public class StrutsSiteMeshFactory extends DefaultFactory { } private boolean isInsideActionTag() { - if(ActionContext.getContext() == null) - return false; + if(ActionContext.getContext() == null) { + if (LOG.isTraceEnabled()) { + LOG.trace("ActionContext is null! Not a user request?"); + } + return false; + } Object attribute = ServletActionContext.getRequest().getAttribute(StrutsStatics.STRUTS_ACTION_TAG_INVOCATION); return (Boolean) ObjectUtils.defaultIfNull(attribute, Boolean.FALSE); } + }
