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

(-)java/org/apache/jk/server/JkMain.java (+11 lines)
Lines 521-526 Link Here
521
    static Hashtable replacements=new Hashtable();
521
    static Hashtable replacements=new Hashtable();
522
    static {
522
    static {
523
        replacements.put("port","channelSocket.port");
523
        replacements.put("port","channelSocket.port");
524
        replacements.put("maxPort", "channelSocket.maxPort");
524
        replacements.put("maxThreads", "channelSocket.maxThreads");   
525
        replacements.put("maxThreads", "channelSocket.maxThreads");   
525
        replacements.put("minSpareThreads", "channelSocket.minSpareThreads");   
526
        replacements.put("minSpareThreads", "channelSocket.minSpareThreads");   
526
        replacements.put("maxSpareThreads", "channelSocket.maxSpareThreads");   
527
        replacements.put("maxSpareThreads", "channelSocket.maxSpareThreads");   
Lines 563-570 Link Here
563
564
564
        while( keys.hasMoreElements() ) {
565
        while( keys.hasMoreElements() ) {
565
            String name=(String)keys.nextElement();
566
            String name=(String)keys.nextElement();
567
            if ("channelSocket.maxPort".equals(name)) {
568
                continue;
569
            }
570
566
            String propValue=props.getProperty( name );
571
            String propValue=props.getProperty( name );
572
            processProperty( name, propValue );
573
        }
567
574
575
        // BZ 49521: set this property later than others
576
        if (props.containsKey("channelSocket.maxPort")) {
577
            String name="channelSocket.maxPort";
578
            String propValue=props.getProperty( name );
568
            processProperty( name, propValue );
579
            processProperty( name, propValue );
569
        }
580
        }
570
    }
581
    }

Return to bug 49521