(FilterDef src, FilterDef dest, boolean failOnConflict)
| 2509 | } |
| 2510 | |
| 2511 | private static boolean mergeFilter(FilterDef src, FilterDef dest, boolean failOnConflict) { |
| 2512 | if (dest.getAsyncSupported() == null) { |
| 2513 | dest.setAsyncSupported(src.getAsyncSupported()); |
| 2514 | } else if (src.getAsyncSupported() != null) { |
| 2515 | if (failOnConflict && !src.getAsyncSupported().equals(dest.getAsyncSupported())) { |
| 2516 | return false; |
| 2517 | } |
| 2518 | } |
| 2519 | |
| 2520 | if (dest.getFilterClass() == null) { |
| 2521 | dest.setFilterClass(src.getFilterClass()); |
| 2522 | } else if (src.getFilterClass() != null) { |
| 2523 | if (failOnConflict && !src.getFilterClass().equals(dest.getFilterClass())) { |
| 2524 | return false; |
| 2525 | } |
| 2526 | } |
| 2527 | |
| 2528 | for (Map.Entry<String,String> srcEntry : src.getParameterMap().entrySet()) { |
| 2529 | if (dest.getParameterMap().containsKey(srcEntry.getKey())) { |
| 2530 | if (failOnConflict && !dest.getParameterMap().get(srcEntry.getKey()).equals(srcEntry.getValue())) { |
| 2531 | return false; |
| 2532 | } |
| 2533 | } else { |
| 2534 | dest.addInitParameter(srcEntry.getKey(), srcEntry.getValue()); |
| 2535 | } |
| 2536 | } |
| 2537 | return true; |
| 2538 | } |
| 2539 | |
| 2540 | private static boolean mergeServlet(ServletDef src, ServletDef dest, boolean failOnConflict) { |
| 2541 | // These tests should be unnecessary... |
no test coverage detected