[jboss-cvs] JBossAS SVN: r76216 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ha.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-07-25 00:37:28 -0400 (Fri, 25 Jul 2008)
New Revision: 76216

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ha/HASingletonAwareResetRequestSource.java
Log:
[JBAS-5659] Don't return null from getResetRequests()

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ha/HASingletonAwareResetRequestSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ha/HASingletonAwareResetRequestSource.java	2008-07-25 04:35:57 UTC (rev 76215)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ha/HASingletonAwareResetRequestSource.java	2008-07-25 04:37:28 UTC (rev 76216)
@@ -23,6 +23,7 @@
 package org.jboss.web.tomcat.service.modcluster.ha;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.catalina.Server;
@@ -63,6 +64,7 @@
       this.haServiceName = haServiceName;
    }
    
+   @SuppressWarnings("unchecked")
    public List<MCMPRequest> getResetRequests()   
    {
       if (this.master)
@@ -73,7 +75,7 @@
       }
       else
       {
-         return null;
+         return Collections.EMPTY_LIST;
       }
    }