LDEV-6107 - encapsulate variables to prevent write access

Author: michaeloffner

core/src/main/java/lucee/runtime/PageSourceImpl.java

@@ -91,19 +91,26 @@ public final class PageSourceImpl implements PageSource {
 	private boolean flush = false;
 
 	private static class PageAndClassName {
-		private Page page;
-		private String className;
+		private Page _page;
+		private String _className;
 
 		public void reset() {
-			this.page = null;
-			this.className = null;
+			this._page = null;
+			this._className = null;
 		}
 
 		public void set(Page page) {
-			this.page = page;
-			if (page != null) className = page.getClass().getName();
+			this._page = page;
+			if (page != null) _className = page.getClass().getName();
 		}
 
+		public Page getPage() {
+			return _page;
+		}
+
+		public String getClassName() {
+			return _className;
+		}
 	}
 
 	PageSourceImpl(MappingImpl mapping, String relPath, boolean isOutSide) {
@@ -119,7 +126,7 @@ public void set(Page page) {
 	 * @return
 	 */
 	public Page getPage() {
-		return pcn.page;
+		return pcn.getPage();
 	}
 
 	public PageSource getParent() {
@@ -152,7 +159,7 @@ else if (realPath.startsWith("./")) {
 	public Page loadPage(PageContext pc, boolean forceReload) throws PageException {
 		if (forceReload) pcn.reset();
 
-		Page page = pcn.page;
+		Page page = pcn.getPage();
 		if (mapping.isPhysicalFirst()) {
 			page = loadPhysical(pc, page);
 			if (page == null) page = loadArchive(page);
@@ -171,7 +178,7 @@ public Page loadPage(PageContext pc, boolean forceReload) throws PageException {
 	public Page loadPageThrowTemplateException(PageContext pc, boolean forceReload, Page defaultValue) throws PageException {
 		if (forceReload) pcn.reset();
 
-		Page page = pcn.page;
+		Page page = pcn.getPage();
 		if (mapping.isPhysicalFirst()) {
 			page = loadPhysical(pc, page);
 			if (page == null) page = loadArchive(page);
@@ -189,7 +196,7 @@ public Page loadPageThrowTemplateException(PageContext pc, boolean forceReload,
 	public Page loadPage(PageContext pc, boolean forceReload, Page defaultValue) {
 		if (forceReload) pcn.reset();
 
-		Page page = pcn.page;
+		Page page = pcn.getPage();
 		if (mapping.isPhysicalFirst()) {
 			try {
 				page = loadPhysical(pc, page);
@@ -330,7 +337,7 @@ && isLoad(LOAD_PHYSICAL))
 			// load page
 			else {
 				try {
-					String cn = pcn.className;
+					String cn = pcn.getClassName();
 					boolean done = false;
 					if (cn != null) {
 						try {
@@ -381,7 +388,7 @@ && isLoad(LOAD_PHYSICAL))
 
 	public boolean releaseWhenOutdatted() {
 		if (!mapping.hasPhysical() || !isLoad(LOAD_PHYSICAL)) return false;
-		Page page = pcn.page;
+		Page page = pcn.getPage();
 		Resource srcFile = getPhyscalFile();
 		long srcLastModified = srcFile.lastModified();
 		// Page exists
@@ -402,12 +409,12 @@ public boolean releaseWhenOutdatted() {
 
 	public void flush() {
 		if (LogUtil.doesTrace(mapping.getLog())) mapping.getLog().trace("page-source", "flush [" + getDisplayPath() + "]");
-		pcn.page = null;
+		pcn.reset();
 		flush = true;
 	}
 
 	private boolean isLoad(byte load) {
-		Page page = pcn.page;
+		Page page = pcn.getPage();
 		return page != null && load == page.getLoadType();
 	}
 
@@ -1043,7 +1050,7 @@ public Resource getResourceTranslated(PageContext pc) throws ExpressionException
 	}
 
 	public void clear() {
-		mapping.clear(pcn.className);
+		mapping.clear(pcn.getClassName());
 		pcn.reset();
 	}
 
@@ -1053,7 +1060,7 @@ public void clear() {
 	 * @param cl
 	 */
 	public boolean clear(ClassLoader cl) {
-		Page page = pcn.page;
+		Page page = pcn.getPage();
 		if (page != null && page.getClass().getClassLoader().equals(cl)) {
 			pcn.reset();
 			return true;
@@ -1062,7 +1069,7 @@ public boolean clear(ClassLoader cl) {
 	}
 
 	public boolean isLoad() {
-		return pcn.page != null;//// load!=LOAD_NONE;
+		return pcn.getPage() != null;//// load!=LOAD_NONE;
 	}
 
 	@Override
@@ -1144,7 +1151,7 @@ public boolean executable() {
 
 	public void resetLoaded() {
 		if (LogUtil.doesTrace(mapping.getLog())) mapping.getLog().trace("page-source", "reset loaded [" + getDisplayPath() + "]");
-		Page p = pcn.page;
+		Page p = pcn.getPage();
 		if (p != null) p.setLoadType((byte) 0);
 	}
 

loader/build.xml

@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="7.0.2.90-SNAPSHOT"/>
+  <property name="version" value="7.0.2.91-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>7.0.2.90-SNAPSHOT</version>
+  <version>7.0.2.91-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>