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

(-)C:/usr/workspace/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java (-7 / +12 lines)
Lines 196-209 Link Here
196
            ServletException {
196
            ServletException {
197
197
198
         if (getEnabled() 
198
         if (getEnabled() 
199
             && getCluster() != null
200
             && request.getContext() != null
199
             && request.getContext() != null
201
             && request.getContext().getDistributable() ) {
200
             && request.getContext().getDistributable() ) {
202
             // valve cluster can access manager - other cluster handle turnover 
201
             // valve cluster can access manager - other cluster handle turnover 
203
             // at host level - hopefully!
202
             // at host level - hopefully!
204
             Manager manager = request.getContext().getManager();
203
             Manager manager = request.getContext().getManager();
205
             if (manager != null && manager instanceof ClusterManager
204
             if (manager != null)
206
                     && getCluster().getManager(((ClusterManager)manager).getName()) != null)
207
                 handlePossibleTurnover(request, response);
205
                 handlePossibleTurnover(request, response);
208
        }
206
        }
209
        // Pass this request on to the next valve in our pipeline
207
        // Pass this request on to the next valve in our pipeline
Lines 360-367 Link Here
360
            request.setAttribute(sessionIdAttribute, sessionId);
358
            request.setAttribute(sessionIdAttribute, sessionId);
361
        }
359
        }
362
        // now sending the change to all other clusternode!
360
        // now sending the change to all other clusternode!
363
        ClusterManager manager = (ClusterManager)catalinaSession.getManager();
361
        if(cluster != null) {
364
        sendSessionIDClusterBackup(manager,request,sessionId, newSessionID);
362
        	ClusterManager manager = (ClusterManager)catalinaSession.getManager();
363
        	sendSessionIDClusterBackup(manager,request,sessionId, newSessionID);
364
        }
365
        lifecycle
365
        lifecycle
366
                .fireLifecycleEvent("After session migration", catalinaSession);
366
                .fireLifecycleEvent("After session migration", catalinaSession);
367
        if (log.isDebugEnabled()) {
367
        if (log.isDebugEnabled()) {
Lines 509-521 Link Here
509
                }
509
                }
510
            }
510
            }
511
        }
511
        }
512
        /*
512
        if (cluster == null) {
513
        if (cluster == null) {
513
            throw new RuntimeException("No clustering support at container "
514
            throw new RuntimeException("No clustering support at container "
514
                    + container.getName());
515
                    + container.getName());
515
        }
516
        }*/
516
        
517
        
517
        if (log.isInfoEnabled())
518
        if (log.isInfoEnabled()) {
518
            log.info(sm.getString("jvmRoute.valve.started"));
519
            log.info(sm.getString("jvmRoute.valve.started"));
520
            if(cluster == null) {
521
            	log.info(sm.getString("jvmRoute.valve.nocluster"));
522
            }
523
        }
519
524
520
    }
525
    }
521
526

Return to bug 40551