You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2011/02/21 16:31:23 UTC
svn commit: r1073020 - in
/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper:
compiler/Compiler.java servlet/JspServletWrapper.java
Author: cziegeler
Date: Mon Feb 21 15:31:22 2011
New Revision: 1073020
URL: http://svn.apache.org/viewvc?rev=1073020&view=rev
Log:
SLING-1990 : Last modified of jsp should not be compared against compiled class if jsp is modified
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java?rev=1073020&r1=1073019&r2=1073020&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java Mon Feb 21 15:31:22 2011
@@ -358,8 +358,11 @@ public abstract class Compiler {
* .java file.
*/
public boolean isOutDated(final boolean checkClass) {
- if ( jsw.getLastModificationTest() != 0 ) {
+ final long lastModifiedTest = jsw.getLastModificationTest();
+ if ( lastModifiedTest > 0 ) {
return false;
+ } else if ( lastModifiedTest < 0 ) {
+ return true;
}
final String jsp = ctxt.getJspFile();
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java?rev=1073020&r1=1073019&r2=1073020&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java Mon Feb 21 15:31:22 2011
@@ -219,9 +219,9 @@ public class JspServletWrapper {
if (ctxt.isRemoved()) {
throw new FileNotFoundException(jspUri);
}
- if (firstTime || this.lastModificationTest == 0) {
+ if (firstTime || this.lastModificationTest <= 0) {
synchronized (this) {
- if (firstTime || this.lastModificationTest == 0 ) {
+ if (firstTime || this.lastModificationTest <= 0 ) {
ctxt.compile();
this.lastModificationTest = System.currentTimeMillis();
firstTime = false;
@@ -347,9 +347,9 @@ public class JspServletWrapper {
/*
* (1) Compile
*/
- if (firstTime || this.lastModificationTest == 0 ) {
+ if (firstTime || this.lastModificationTest <= 0 ) {
synchronized (this) {
- if (firstTime || this.lastModificationTest == 0 ) {
+ if (firstTime || this.lastModificationTest <= 0 ) {
// The following sets reload to true, if necessary
ctxt.compile();
this.lastModificationTest = System.currentTimeMillis();
@@ -475,7 +475,7 @@ public class JspServletWrapper {
*Clea the lastModificationTest.
*/
public void clearLastModificationTest() {
- this.lastModificationTest = 0;
+ this.lastModificationTest = -1;
}
/**