← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/tomcat6/oneiric

« back to all changes in this revision

Viewing changes to java/org/apache/tomcat/util/net/JIoEndpoint.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-07-20 14:36:48 UTC
  • mfrom: (2.2.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100720143648-23y81x6cq1kv1z00
Tags: 6.0.28-2
* Add debconf questions for user, group and Java options.
* Use ucf to install /etc/default/tomcat6 from a template
* Drop CATALINA_BASE and CATALINA_HOME from /etc/default/tomcat6 since we
  shouldn't encourage users to change those anyway

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/tomcat/util/net/JIoEndpoint.java
752
752
     */
753
753
    protected Worker getWorkerThread() {
754
754
        // Allocate a new worker thread
755
 
        Worker workerThread = createWorkerThread();
756
 
        while (workerThread == null) {
757
 
            try {
758
 
                synchronized (workers) {
 
755
        synchronized (workers) {
 
756
            Worker workerThread;
 
757
            while ((workerThread = createWorkerThread()) == null) {
 
758
                try {
759
759
                    workers.wait();
 
760
                } catch (InterruptedException e) {
 
761
                    // Ignore
760
762
                }
761
 
            } catch (InterruptedException e) {
762
 
                // Ignore
763
763
            }
764
 
            workerThread = createWorkerThread();
 
764
            return workerThread;
765
765
        }
766
 
        return workerThread;
767
766
    }
768
767
 
769
768