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

(-)java/org/apache/catalina/startup/HostConfig.java (-5 / +7 lines)
Lines 1214-1224 Link Here
1214
                    log.warn(sm.getString
1214
                    log.warn(sm.getString
1215
                             ("hostConfig.context.remove", app.name), t);
1215
                             ("hostConfig.context.remove", app.name), t);
1216
                }
1216
                }
1217
                try {
1217
                if (context != null) {
1218
                    context.destroy();
1218
                    try {
1219
                } catch (Throwable t) {
1219
                        context.destroy();
1220
                    log.warn(sm.getString
1220
                    } catch (Throwable t) {
1221
                             ("hostConfig.context.destroy", app.name), t);
1221
                        log.warn(sm.getString
1222
                                ("hostConfig.context.destroy", app.name), t);
1223
                    }
1222
                }
1224
                }
1223
                // Delete all redeploy resources
1225
                // Delete all redeploy resources
1224
                for (int j = i + 1; j < resources.length; j++) {
1226
                for (int j = i + 1; j < resources.length; j++) {

Return to bug 51162