You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/07/20 16:00:49 UTC
svn commit: r1612088 -
/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java
Author: rmannibucau
Date: Sun Jul 20 14:00:49 2014
New Revision: 1612088
URL: http://svn.apache.org/r1612088
Log:
allow to mute force refresh feature
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java?rev=1612088&r1=1612087&r2=1612088&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/AdditionalDocBase.java Sun Jul 20 14:00:49 2014
@@ -31,6 +31,7 @@ public class AdditionalDocBase extends F
private static final String PREFIX = "/META-INF/resources";
private static final int PREFIX_LENGTH = PREFIX.length();
private static final String WEB_INF_CLASSES = "/WEB-INF/classes";
+ private static final boolean RESPECT_HEADERS = Boolean.getBoolean("tomee.AdditionalDocBase.respect-headers");
@Override
protected File file(final String name) {
@@ -44,12 +45,14 @@ public class AdditionalDocBase extends F
}
@Override
- protected Attributes doGetAttributes(String name, String[] attrIds) throws NamingException {
+ protected Attributes doGetAttributes(final String name, final String[] attrIds) throws NamingException {
+ if (RESPECT_HEADERS) {
+ return super.doGetAttributes(name, attrIds);
+ }
final File file = file(name);
-
- if (file == null)
+ if (file == null) {
return null;
-
+ }
return new ForceRefeshAttributes(file);
}