antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

removed import of helma.objectmodel.Node

Browse source
This commit is contained in:
hns 2001-07-31 22:38:49 +00:00
parent 44f7947798
commit a8b5c39105
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/helma/servlet/AbstractServletClient.java
View file

@ -13,7 +13,6 @@ import java.rmi.Naming;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.util.*; import java.util.*;
import helma.framework.*; import helma.framework.*;
import helma.objectmodel.Node;
import helma.util.*; import helma.util.*;
/** /**
@ -41,7 +40,7 @@ public abstract class AbstractServletClient extends HttpServlet {
port = portstr == null ? 5055 : Integer.parseInt (portstr); port = portstr == null ? 5055 : Integer.parseInt (portstr);
String upstr = init.getInitParameter ("uploadLimit"); String upstr = init.getInitParameter ("uploadLimit");
uploadLimit = upstr == null ? 500 : Integer.parseInt (upstr); uploadLimit = upstr == null ? 1024 : Integer.parseInt (upstr);
cookieDomain = init.getInitParameter ("cookieDomain"); cookieDomain = init.getInitParameter ("cookieDomain");
@ -138,7 +137,7 @@ public abstract class AbstractServletClient extends HttpServlet {
// File Upload // File Upload
Uploader up; Uploader up;
try { try {
if ((up = getUpload (uploadLimit, request)) != null) { if ((up = getUpload (request)) != null) {
Hashtable upload = up.getParts (); Hashtable upload = up.getParts ();
for (Enumeration e = upload.keys(); e.hasMoreElements(); ) { for (Enumeration e = upload.keys(); e.hasMoreElements(); ) {
String nextKey = (String) e.nextElement (); String nextKey = (String) e.nextElement ();
@ -231,24 +230,20 @@ public abstract class AbstractServletClient extends HttpServlet {
public Uploader getUpload (HttpServletRequest request) throws Exception { public Uploader getUpload (HttpServletRequest request) throws Exception {
return getUpload (500, request);
}
public Uploader getUpload (int maxKbytes, HttpServletRequest request) throws Exception {
int contentLength = request.getContentLength (); int contentLength = request.getContentLength ();
BufferedInputStream in = new BufferedInputStream (request.getInputStream ()); BufferedInputStream in = new BufferedInputStream (request.getInputStream ());
Uploader up = null; Uploader up = null;
try { try {
if (contentLength > maxKbytes*1024) { if (contentLength > uploadLimit*1024) {
// consume all input to make Apache happy // consume all input to make Apache happy
byte b[] = new byte[1024]; byte b[] = new byte[1024];
int read = 0; int read = 0;
while (read > -1) while (read > -1)
read = in.read (b, 0, 1024); read = in.read (b, 0, 1024);
throw new RuntimeException ("Upload exceeds limit of "+maxKbytes+" kb."); throw new RuntimeException ("Upload exceeds limit of "+uploadLimit+" kb.");
} }
String contentType = request.getContentType (); String contentType = request.getContentType ();
up = new Uploader(maxKbytes); up = new Uploader(uploadLimit);
up.load (in, contentType, contentLength); up.load (in, contentType, contentLength);
} finally { } finally {
try { in.close (); } catch (Exception ignore) {} try { in.close (); } catch (Exception ignore) {}