Changes

- Removed old workaround/cast for NIO buffers in Java 1.8; doesn't work
anymore with Jetty and newer Java versions.
- Added ws_upload_buffer_size to configuration that is used by new
upload logic.
- NanoHTTPD BEETROOT 2.3.6

Author: autumoswitzerland

cfg/beetroot.cfg

@@ -332,6 +332,11 @@ ws_cache_size=2
 #
 ws_file_cache_size=200
 
+#
+# Upload buffer size in kBytes.
+#
+ws_upload_buffer_size=16
+
 #
 # Response buffer size in kBytes.
 #

cfg/beetroot_dist.cfg

@@ -332,6 +332,11 @@ ws_cache_size=2
 #
 ws_file_cache_size=200
 
+#
+# Upload buffer size in kBytes.
+#
+ws_upload_buffer_size=16
+
 #
 # Response buffer size in kBytes.
 #

cfg/beetroot_test.cfg

@@ -332,6 +332,11 @@ ws_cache_size=1
 #
 ws_file_cache_size=200
 
+#
+# Upload buffer size in kBytes.
+#
+ws_upload_buffer_size=16
+
 #
 # Response buffer size in kBytes.
 #

db/h2/db/test/beetroot.mv.db

@@ -63,7 +63,7 @@ The following web containers are supported.
 	$ java -jar $JETTY_HOME/start.jar --add-modules=server,http,ee11-deploy
 	```
 
-	Make sure the environment variable `JETTY_HOME` is set; it should point to the `jetty-home-12.x.x` directory. Also, set the environment variable `JETTY_BASE` to point to the base directory you created. 
+	Make sure the environment variable `JETTY_HOME` is set; it should point to the `jetty-home-12.x.x` directory. Also, set the environment variable `JETTY_BASE` to point to the base directory you created.
 
 3. For proper [Log4j 2 logging](https://logging.apache.org/log4j/2.12.x/index.html) via [SLF4J](https://www.slf4j.org/), you unfortunately need to provide your own `log4j2.xml` file. Jetty does not automatically read Log4j2 configurations from standard locations within the web archive. Therefore, create this file in your base directory at `resources/log4j2.xml`: 
 
@@ -123,6 +123,8 @@ The following web containers are supported.
 
 6. Place `beetroot-jetty.war` into the `webapps/` folder of your Jetty base directory. Start Jetty, then open your browser and navigate `http://localhost:8080/beetroot`.
 
+**Note**: Keep in mind that Jetty, by default, extracts the WAR into a temporary directory. When the server is restarted, this directory is deleted and a new one is created. Therefore, you cannot apply patches in this default mode, nor will any data stored inside the internal H2 database persist. If you require a persistent deployment, you must configure Jetty to run the application in exploded WAR mode.
+
 For further instructions, see: [Jetty 12.1 Operations Guide](https://jetty.org/docs/jetty/12.1/operations-guide/begin/index.html).
 
 ### Oracle WebLogic

doc/running.md

@@ -28,7 +28,7 @@
 		<version.maven.surefire.plugin>3.5.4</version.maven.surefire.plugin>
 
 		<version.autumo.beetroot>3.2.0</version.autumo.beetroot>
-		<version.nanohttpd>BEETROOT-2.3.5</version.nanohttpd>
+		<version.nanohttpd>BEETROOT-2.3.6</version.nanohttpd>
 		<version.hikaricp>7.0.2</version.hikaricp>
 		<version.jcolor>5.5.1</version.jcolor>
 		<version.angus.activation>2.0.3</version.angus.activation>

etc/pom/pom.xml

@@ -52,7 +52,7 @@
 		<version.maven.resources.plugin>3.4.0</version.maven.resources.plugin>
 		<version.maven.surefire.plugin>3.5.4</version.maven.surefire.plugin>
 
-		<version.nanohttpd>BEETROOT-2.3.5</version.nanohttpd>
+		<version.nanohttpd>BEETROOT-2.3.6</version.nanohttpd>
 		<version.hikaricp>7.0.2</version.hikaricp>
 		<version.jcolor>5.5.1</version.jcolor>
 		<version.angus.activation>2.0.3</version.angus.activation>

lib/repo/ch/autumo/beetroot/autumo-beetroot/3.2.0/autumo-beetroot-3.2.0.jar

@@ -17,6 +17,7 @@
  */
 package ch.autumo.beetroot;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -32,10 +33,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.Part;
-
 import org.nanohttpd.protocols.http.HTTPSession;
 import org.nanohttpd.protocols.http.NanoHTTPD;
 import org.nanohttpd.protocols.http.NanoHTTPD.ResponseException;
@@ -50,6 +47,9 @@
 import org.slf4j.LoggerFactory;
 
 import ch.autumo.beetroot.handler.ErrorHandler;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Part;
 
 /**
  * BeetRoot HTTP session.
@@ -60,12 +60,18 @@ public class BeetRootHTTPSession extends HTTPSession {
 
 	static {
 
-		int kBytes = BeetRootConfigurationManager.getInstance().getInt("ws_response_buffer_size");
+		int kBytes = BeetRootConfigurationManager.getInstance().getInt("ws_upload_buffer_size");
 		if (kBytes == -1) {
-			LOG.warn("Using 16 kBytes for response buffer size.");
+			LOG.warn("Using 16 kBytes for upload buffer size.");
 			kBytes = 16;
 		}
+		UPLOAD_BUFFER_SIZE = kBytes * 1024;
 
+		kBytes = BeetRootConfigurationManager.getInstance().getInt("ws_response_buffer_size");
+		if (kBytes == -1) {
+			LOG.warn("Using 16 kBytes for response buffer size.");
+			kBytes = 16;
+		}
 		RESPONSE_BUFFER_SIZE = kBytes * 1024;
 		System.setProperty("ch.autumo.beetroot.respDownBufSizeKB", "" + kBytes);
 
@@ -74,15 +80,18 @@ public class BeetRootHTTPSession extends HTTPSession {
 			LOG.warn("Using 8 kBytes for response download buffer size.");
 			kBytesDown = 8;
 		}
-
 		RESPONSE_DOWNLOAD_BUFFER_SIZE = kBytesDown * 1024;
+
 	}
 
-	// buffer size
-	public static final long RESPONSE_BUFFER_SIZE;
+	// Upload buffer size.
+	public static final int UPLOAD_BUFFER_SIZE;
 
-	// download buffer size
-	public static final long RESPONSE_DOWNLOAD_BUFFER_SIZE;
+	// Response buffer size.
+	public static final int RESPONSE_BUFFER_SIZE;
+
+	// Download response buffer size.
+	public static final int RESPONSE_DOWNLOAD_BUFFER_SIZE;
 
     private String externalSessionId;
 
@@ -170,7 +179,7 @@ public void executeForServlet(BeetRootService beetRootService, HttpServletReques
             	if (downHeaderVal != null) {
             		response.setContentType(r.getMimeType());
             		response.setHeader("Content-disposition", downHeaderVal);
-            		final byte[] buffer = new byte[Long.valueOf(RESPONSE_BUFFER_SIZE).intValue()];
+            		final byte[] buffer = new byte[RESPONSE_BUFFER_SIZE];
             		int numBytesRead;
                     while ((numBytesRead = r.getData().read(buffer)) > 0) {
                         response.getOutputStream().write(buffer, 0, numBytesRead);
@@ -278,14 +287,18 @@ public void parseBodyForServlet(Map<String, String> files, HttpServletRequest re
 			if (partName.startsWith("MAX") || partName.startsWith("_"))
 				continue LOOP;
 
-			int size = (int) part.getSize();
-			InputStream inputStream = part.getInputStream();
-			byte[] bytes = new byte[inputStream.available()];
-			inputStream.read(bytes);
-
-            ByteBuffer fbuf = ByteBuffer.wrap(bytes, 0, bytes.length);
-           	final String path = saveTmpFile(fbuf, 0, size, part.getSubmittedFileName());
-            files.put(partName, path);
+			final InputStream inputStream = part.getInputStream();
+			final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			byte[] buffer = new byte[UPLOAD_BUFFER_SIZE];
+			int read;
+			while ((read = inputStream.read(buffer)) != -1) {
+			    baos.write(buffer, 0, read);
+			}
+			byte[] bytes = baos.toByteArray();
+
+			final ByteBuffer fbuf = ByteBuffer.wrap(bytes, 0, bytes.length);
+			final String path = saveTmpFile(fbuf, 0, bytes.length, part.getSubmittedFileName());
+			files.put(partName, path);
 
 			List<String> values = super.parms.get(partName);
             if (values == null) {