Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jetty-9 more compile fixes

This commit is contained in:
Greg Wilkins 2012-02-09 23:55:22 +11:00
parent 2659d87868
commit efb6f84503
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
View File

@ -15,9 +15,8 @@ package org.eclipse.jetty.http;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer;
import org.eclipse.jetty.io.Buffer;
import org.eclipse.jetty.io.ByteArrayBuffer;
import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.Resource;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -27,10 +26,10 @@ import org.eclipse.jetty.util.resource.Resource;
*/ */
public interface HttpContent public interface HttpContent
{ {
Buffer getContentType(); ByteBuffer getContentType();
Buffer getLastModified(); ByteBuffer getLastModified();
Buffer getIndirectBuffer(); ByteBuffer getIndirectBuffer();
Buffer getDirectBuffer(); ByteBuffer getDirectBuffer();
Resource getResource(); Resource getResource();
long getContentLength(); long getContentLength();
InputStream getInputStream() throws IOException; InputStream getInputStream() throws IOException;
@ -42,17 +41,17 @@ public interface HttpContent
public class ResourceAsHttpContent implements HttpContent public class ResourceAsHttpContent implements HttpContent
{ {
final Resource _resource; final Resource _resource;
final Buffer _mimeType; final ByteBuffer _mimeType;
final int _maxBuffer; final int _maxBuffer;
public ResourceAsHttpContent(final Resource resource, final Buffer mimeType) public ResourceAsHttpContent(final Resource resource, final ByteBuffer mimeType)
{ {
_resource=resource; _resource=resource;
_mimeType=mimeType; _mimeType=mimeType;
_maxBuffer=-1; _maxBuffer=-1;
} }
public ResourceAsHttpContent(final Resource resource, final Buffer mimeType, int maxBuffer) public ResourceAsHttpContent(final Resource resource, final ByteBuffer mimeType, int maxBuffer)
{ {
_resource=resource; _resource=resource;
_mimeType=mimeType; _mimeType=mimeType;
@ -60,32 +59,47 @@ public interface HttpContent
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public Buffer getContentType() public ByteBuffer getContentType()
{ {
return _mimeType; return _mimeType;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public Buffer getLastModified() public ByteBuffer getLastModified()
{ {
return null; return null;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public Buffer getDirectBuffer() public ByteBuffer getDirectBuffer()
{ {
return null; return null;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public Buffer getIndirectBuffer() public ByteBuffer getIndirectBuffer()
{ {
try try
{ {
if (_resource.length()<=0 || _maxBuffer<_resource.length()) if (_resource.length()<=0 || _maxBuffer<_resource.length())
return null; return null;
ByteArrayBuffer buffer = new ByteArrayBuffer((int)_resource.length()); int length=(int)_resource.length();
buffer.readFrom(_resource.getInputStream(),(int)_resource.length()); byte[] array = new byte[length];
int offset=0;
InputStream in=_resource.getInputStream();
do
{
int filled=in.read(array,offset,length);
if (filled<0)
break;
length-=filled;
offset+=filled;
}
while(length>0);
ByteBuffer buffer = ByteBuffer.wrap(array);
return buffer; return buffer;
} }
catch(IOException e) catch(IOException e)

9
jetty-http/src/main/java/org/eclipse/jetty/http/HttpHeaders.java
View File

@ -133,5 +133,14 @@ public enum HttpHeaders
{ {
return _string; return _string;
} }
public static void main (String[] args)
{
for (HttpHeaders h : HttpHeaders.values())
{
System.err.println("\n\n"+h);
CACHE.get(h.toString());
}
}
} }

4
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
View File

@ -489,7 +489,7 @@ public class BufferUtil
i=buffer.position()-16; i=buffer.position()-16;
} }
} }
buf.append("}{"); buf.append("<<<");
for (int i=buffer.position();i<buffer.limit();i++) for (int i=buffer.position();i<buffer.limit();i++)
{ {
char c=(char)buffer.get(i); char c=(char)buffer.get(i);
@ -505,7 +505,7 @@ public class BufferUtil
i=buffer.limit()-16; i=buffer.limit()-16;
} }
} }
buf.append("}{"); buf.append(">>>");
int limit=buffer.limit(); int limit=buffer.limit();
buffer.limit(buffer.capacity()); buffer.limit(buffer.capacity());
for (int i=limit;i<buffer.capacity();i++) for (int i=limit;i<buffer.capacity();i++)