Author: sebb
Date: Thu Mar 15 23:51:31 2012
New Revision: 1301276
URL: http://svn.apache.org/viewvc?rev=1301276&view=rev
Log:
Length check does not need to be protected by lock
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java?rev=1301276&r1=1301275&r2=1301276&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
Thu Mar 15 23:51:31 2012
@@ -166,18 +166,19 @@ public final class DotTerminatedMessageR
@Override
public int read(char[] buffer, int offset, int length) throws IOException
{
- int ch, off;
+ if (length < 1)
+ {
+ return 0;
+ }
+ int ch;
synchronized (lock)
{
- if (length < 1)
- {
- return 0;
- }
if ((ch = read()) == -1)
{
return -1;
}
- off = offset;
+
+ int off = offset;
do
{
