Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-28 10:59:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc findbugs cleanups

Browse Source
This commit is contained in:
Greg Wilkins 2011-09-07 15:57:18 +10:00
parent cf45e7b647
commit 65a1e84886
9 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
View File

@ -334,7 +334,9 @@ public class HttpFields
{
if (__cache.size()>__cacheSize)
__cache.clear();
__cache.putIfAbsent(value,buffer);
Buffer b=__cache.putIfAbsent(value,buffer);
if (b!=null)
buffer=b;
}
return buffer;

4
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/GzipResponseWrapper.java
View File

@ -35,8 +35,8 @@ import org.eclipse.jetty.util.StringUtil;
*/
public class GzipResponseWrapper extends HttpServletResponseWrapper
{
public static int DEFAULT_BUFFER_SIZE = 8192;
public static int DEFAULT_MIN_GZIP_SIZE = 256;
public static final int DEFAULT_BUFFER_SIZE = 8192;
public static final int DEFAULT_MIN_GZIP_SIZE = 256;
private HttpServletRequest _request;
private Set<String> _mimeTypes;

3
jetty-http/src/main/java/org/eclipse/jetty/http/security/Constraint.java
View File

@ -14,6 +14,7 @@
package org.eclipse.jetty.http.security;
import java.io.Serializable;
import java.util.Arrays;
/* ------------------------------------------------------------ */
/**
@ -209,7 +210,7 @@ public class Constraint implements Cloneable, Serializable
{
return "SC{" + _name
+ ","
+ (_anyRole ? "*" : (_roles == null ? "-" : _roles.toString()))
+ (_anyRole ? "*" : (_roles == null ? "-" : Arrays.asList(_roles).toString()))
+ ","
+ (_dataConstraint == DC_UNSET ? "DC_UNSET}" : (_dataConstraint == DC_NONE ? "NONE}" : (_dataConstraint == DC_INTEGRAL ? "INTEGRAL}" : "CONFIDENTIAL}")));
}

10
jetty-http/src/main/java/org/eclipse/jetty/http/security/Password.java
View File

@ -152,12 +152,22 @@ public class Password extends Credential
{
case 1:
buf.append('0');
buf.append('0');
buf.append('0');
buf.append(x);
break;
case 2:
buf.append('0');
buf.append('0');
buf.append(x);
break;
case 3:
buf.append('0');
buf.append(x);
break;
default:
buf.append(x);
break;
}
}
return buf.toString();

10
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
View File

@ -387,7 +387,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
private final ConcurrentLinkedQueue<Object> _changes = new ConcurrentLinkedQueue<Object>();
private Selector _selector;
private volatile Selector _selector;
private volatile Thread _selecting;
private int _jvmBug;
@ -975,7 +975,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
// close endpoints and selector
synchronized (this)
{
for (SelectionKey key:_selector.keys())
Selector selector=_selector;
for (SelectionKey key:selector.keys())
{
if (key==null)
continue;
@ -998,8 +999,9 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
_timeout.cancelAll();
try
{
if (_selector != null)
_selector.close();
selector=_selector;
if (selector != null)
selector.close();
}
catch (IOException e)
{

19
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
View File

@ -300,7 +300,12 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
}
}
}
catch (Exception x)
catch (ThreadDeath x)
{
super.close();
throw x;
}
catch (Throwable x)
{
LOG.debug(x);
super.close();
@ -444,8 +449,11 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
case BUFFER_OVERFLOW:
case BUFFER_UNDERFLOW:
LOG.warn("wrap {}",_result);
_closing=true;
break;
case CLOSED:
_closing=true;
break;
}
_outNIOBuffer.setPutIndex(put+_result.bytesProduced());
@ -500,7 +508,7 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
public int flush(Buffer header, Buffer buffer, Buffer trailer) throws IOException
{
int consumed=0;
int available=header.length();
int available=header==null?0:header.length();
if (buffer!=null)
available+=buffer.length();
@ -599,8 +607,11 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
case BUFFER_OVERFLOW:
case BUFFER_UNDERFLOW:
LOG.warn("unwrap {}",_result);
_closing=true;
break;
case CLOSED:
_closing=true;
break;
}
_outNIOBuffer.setPutIndex(put+_result.bytesProduced());
}
@ -895,6 +906,8 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
case BUFFER_OVERFLOW:
case BUFFER_UNDERFLOW:
LOG.warn("unwrap {}",_result);
_closing=true;
return _result.bytesConsumed()>0?_result.bytesConsumed():-1;
case OK:
return _result.bytesConsumed();
@ -965,6 +978,8 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
case BUFFER_OVERFLOW:
case BUFFER_UNDERFLOW:
LOG.warn("unwrap {}",_result);
_closing=true;
return _result.bytesConsumed()>0?_result.bytesConsumed():-1;
case OK:
return _result.bytesConsumed();

29
jetty-io/src/test/java/org/eclipse/jetty/io/IOTest.java
View File

@ -42,33 +42,4 @@ public class IOTest
out.toString(),
"The quick brown fox jumped over the lazy dog");
}
@Test
public void testStringSpeed()
{
String s="012345678901234567890000000000000000000000000";
char[] ca = new char[s.length()];
int loops=1000000;
long start=System.currentTimeMillis();
long result=0;
for (int loop=0;loop<loops;loop++)
{
for (int c=s.length();c-->0;)
result+=s.charAt(c);
}
long end=System.currentTimeMillis();
System.err.println("charAt "+(end-start)+" "+result);
start=System.currentTimeMillis();
result=0;
for (int loop=0;loop<loops;loop++)
{
s.getChars(0, s.length(), ca, 0);
for (int c=s.length();c-->0;)
result+=ca[c];
}
end=System.currentTimeMillis();
System.err.println("getChars "+(end-start)+" "+result);
}
}

1
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java
View File

@ -115,6 +115,7 @@ public class DigestAuthenticator extends LoginAuthenticator
break;
case ',':
name = null;
break;
case ' ':
break;

2
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
View File

@ -80,7 +80,7 @@ public class WebSocketClientTest
{
}
};
Future<WebSocket.Connection> future = client.open(new URI("ws://127.0.0.1:" + _serverPort + "/"), websocket);
client.open(new URI("ws://127.0.0.1:" + _serverPort + "/"), websocket);
Socket socket = _server.accept();
accept(socket);