Attachment 78218 Details for Bug 202758 – Patch for NET-3 (hanging_read_fix.patch)

[patch] Patch for NET-3 (hanging_read_fix.patch)

hanging_read_fix.patch (text/plain), 1.70 KB, created by Martin Oberhuber

on 2007-09-12 14:27:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2007-09-12 14:27:17 EDT

Size: 1.70 KB

patch

obsolete

>Index: src/java/org/apache/commons/net/telnet/TelnetInputStream.java
>===================================================================
>--- src/java/org/apache/commons/net/telnet/TelnetInputStream.java	(revision 386179)
>+++ src/java/org/apache/commons/net/telnet/TelnetInputStream.java	(working copy)
>@@ -277,6 +277,8 @@
>         {
>             while (__bytesAvailable >= __queue.length - 1)
>             {
>+                // The queue is full. We need to wait before adding any more data to it. Hopefully the stream owner
>+                // will consume some data soon! 
>                 if(__threaded)
>                 {
>                     __queue.notify();
>@@ -289,6 +291,12 @@
>                         throw e;
>                     }
>                 }
>+                else
>+                {
>+                    // We've been asked to add another character to the queue, but it is already full and there's
>+                    // no other thread to drain it. This should not have happened! 
>+                    throw new IllegalStateException("Queue is full! Cannot process another character.");
>+                }
>             }
> 
>             // Need to do this in case we're not full, but block on a read
>@@ -389,8 +397,9 @@
>                                     return (-1);
>                             }
>                         }
>-                        while (super.available() > 0);
>-
>+                        // Continue reading as long as there is data available and the queue is not full.
>+                        while (super.available() > 0 && __bytesAvailable < __queue.length - 1);
>+                        
>                         __readIsWaiting = false;
>                     }
>                     continue;

Actions: View | Diff

Attachments on bug 202758: 77956 | 77957 | 77976 | 77991 | 78057 | 78076 | 78218 | 78220