Author: remy.maucherat(a)jboss.com
Date: 2008-10-23 11:17:08 -0400 (Thu, 23 Oct 2008)
New Revision: 816
Modified:
trunk/java/org/apache/tomcat/bayeux/BayeuxServlet.java
trunk/java/org/apache/tomcat/bayeux/ClientImpl.java
trunk/java/org/apache/tomcat/bayeux/RequestBase.java
Log:
- Port tweaks.
Modified: trunk/java/org/apache/tomcat/bayeux/BayeuxServlet.java
===================================================================
--- trunk/java/org/apache/tomcat/bayeux/BayeuxServlet.java 2008-10-23 13:38:23 UTC (rev
815)
+++ trunk/java/org/apache/tomcat/bayeux/BayeuxServlet.java 2008-10-23 15:17:08 UTC (rev
816)
@@ -93,7 +93,7 @@
protected int getReconnectInterval() {
String rs = servletConfig.getInitParameter("reconnectInterval");
- int rct = 5000; //5 seconds
+ int rct = 1000; // 1 seconds
try {
rct = Integer.parseInt(rs);
}catch (NumberFormatException nfe) {
Modified: trunk/java/org/apache/tomcat/bayeux/ClientImpl.java
===================================================================
--- trunk/java/org/apache/tomcat/bayeux/ClientImpl.java 2008-10-23 13:38:23 UTC (rev 815)
+++ trunk/java/org/apache/tomcat/bayeux/ClientImpl.java 2008-10-23 15:17:08 UTC (rev 816)
@@ -111,9 +111,10 @@
//local clients must have a listener
ArrayList<Message> list = new ArrayList<Message>();
for (int i=0; msgs!=null && i<msgs.length; i++) {
+ //dont deliver to ourselves
if (this!=msgs[i].getClient()) list.add(msgs[i]);
}
- if (getListener() != null) {
+ if (getListener() != null && list.size()>0) {
getListener().deliver(list.toArray(new Message[0]));
}
} else {
Modified: trunk/java/org/apache/tomcat/bayeux/RequestBase.java
===================================================================
--- trunk/java/org/apache/tomcat/bayeux/RequestBase.java 2008-10-23 13:38:23 UTC (rev
815)
+++ trunk/java/org/apache/tomcat/bayeux/RequestBase.java 2008-10-23 15:17:08 UTC (rev
816)
@@ -71,7 +71,7 @@
protected HashMap<String, Object> response = null;
- protected int reconnectInterval;
+ protected int reconnectInterval = 1000;
protected RequestBase(TomcatBayeux tb, HttpEvent event, JSONObject jsReq) throws
JSONException {
this.tomcatBayeux = tb;
Show replies by date