From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 22 Mar 2007 16:54:26 +0000 (+0000)
Subject: Fix NPE when using Executor
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=eeeaa08bf578f92771cab91b492c4b3b370002f2;p=tomcat7.0

Fix NPE when using Executor


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@521342 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index 1e10d6cf0..7f2af0fb4 100644
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -261,7 +261,7 @@ public class JIoEndpoint {
     }
     
     public int getCurrentThreadsBusy() {
-        return curThreads - workers.size();
+        return workers!=null?curThreads - workers.size():0;
     }