View | Details | Raw Unified | Return to bug 51445
Collapse All | Expand All

(-)a/java/org/apache/catalina/core/StandardWrapper.java (-5 / +8 lines)
Lines 1115-1124 public class StandardWrapper extends ContainerBase Link Here
1115
1115
1116
            classLoadTime=(int) (System.currentTimeMillis() -t1);
1116
            classLoadTime=(int) (System.currentTimeMillis() -t1);
1117
1117
1118
            initServlet(servlet);
1119
1120
            // Register our newly initialized instance
1121
            singleThreadModel = servlet instanceof SingleThreadModel;
1118
            singleThreadModel = servlet instanceof SingleThreadModel;
1119
            initServlet(servlet, singleThreadModel);
1120
            // Register our newly initialized instance
1122
            if (singleThreadModel) {
1121
            if (singleThreadModel) {
1123
                if (instancePool == null)
1122
                if (instancePool == null)
1124
                    instancePool = new Stack<Servlet>();
1123
                    instancePool = new Stack<Servlet>();
Lines 1182-1192 public class StandardWrapper extends ContainerBase Link Here
1182
                    new ServletSecurityElement(secAnnotation));
1181
                    new ServletSecurityElement(secAnnotation));
1183
        }
1182
        }
1184
    }
1183
    }
1184
    
1185
    private void initServlet(Servlet servlet) throws ServletException {
1186
    	initServlet(servlet, false);
1187
    }
1185
1188
1186
    private synchronized void initServlet(Servlet servlet)
1189
    private synchronized void initServlet(Servlet servlet, boolean force)
1187
            throws ServletException {
1190
            throws ServletException {
1188
        
1191
        
1189
        if (instanceInitialized) return;
1192
        if (instanceInitialized && !force) return;
1190
1193
1191
        // Call the initialization method of this servlet
1194
        // Call the initialization method of this servlet
1192
        try {
1195
        try {

Return to bug 51445