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

(-)WebappClassLoader.java (-15 / +16 lines)
Lines 636-656 Link Here
636
636
637
        int i;
637
        int i;
638
638
639
        if ((jarPath != null) && (jar.startsWith(jarPath))) {
640
641
            String jarName = jar.substring(jarPath.length());
642
            while (jarName.startsWith("/"))
643
                jarName = jarName.substring(1);
644
645
            String[] result = new String[jarNames.length + 1];
646
            for (i = 0; i < jarNames.length; i++) {
647
                result[i] = jarNames[i];
648
            }
649
            result[jarNames.length] = jarName;
650
            jarNames = result;
651
652
        }
653
654
        try {
639
        try {
655
640
656
            // Register the JAR for tracking
641
            // Register the JAR for tracking
Lines 675-680 Link Here
675
660
676
        } catch (NamingException e) {
661
        } catch (NamingException e) {
677
            // Ignore
662
            // Ignore
663
        	return;
664
        }
665
666
        if ((jarPath != null) && (jar.startsWith(jarPath))) {
667
668
            String jarName = jar.substring(jarPath.length());
669
            while (jarName.startsWith("/"))
670
                jarName = jarName.substring(1);
671
672
            String[] result = new String[jarNames.length + 1];
673
            for (i = 0; i < jarNames.length; i++) {
674
                result[i] = jarNames[i];
675
            }
676
            result[jarNames.length] = jarName;
677
            jarNames = result;
678
678
        }
679
        }
679
680
680
        // If the JAR currently contains invalid classes, don't actually use it
681
        // If the JAR currently contains invalid classes, don't actually use it

Return to bug 45403