Re: svn commit: r889585 - /tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java

2009-12-11 Thread Mark Thomas 
On 11/12/2009 12:37, Tim Funk wrote:
> Did you mena PublishRequest.class?
> 
> +private static final Log log = LogFactory.getLog(RequestBase.class);

I did. I was too quick with the copy and paste.

Mark

> 
> 
> -Tim
> 
> ma...@apache.org wrote:
>> Author: markt
>> Date: Fri Dec 11 12:14:05 2009
>> New Revision: 889585
>>
>> URL: http://svn.apache.org/viewvc?rev=889585&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48370
>> Remove some unused imports
>>
>> Modified:
>>
>> tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java
>>
>>
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r889585 - /tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java

2009-12-11 Thread Tim Funk 

Did you mena PublishRequest.class?

+private static final Log log = LogFactory.getLog(RequestBase.class);


-Tim

ma...@apache.org wrote:

Author: markt
Date: Fri Dec 11 12:14:05 2009
New Revision: 889585

URL: http://svn.apache.org/viewvc?rev=889585&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48370
Remove some unused imports

Modified:

tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r889585 - /tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java

2009-12-11 Thread markt 
Author: markt
Date: Fri Dec 11 12:14:05 2009
New Revision: 889585

URL: http://svn.apache.org/viewvc?rev=889585&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48370
Remove some unused imports

Modified:

tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java

Modified: 
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java?rev=889585&r1=889584&r2=889585&view=diff
==
--- 
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java
 (original)
+++ 
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java
 Fri Dec 11 12:14:05 2009
@@ -23,18 +23,16 @@
 import org.apache.catalina.comet.CometEvent;
 import org.apache.tomcat.bayeux.HttpError;
 import org.apache.tomcat.bayeux.BayeuxException;
-import org.apache.tomcat.bayeux.BayeuxRequest;
 import org.apache.tomcat.bayeux.ChannelImpl;
 import org.apache.tomcat.bayeux.ClientImpl;
 import org.apache.tomcat.bayeux.MessageImpl;
+import org.apache.tomcat.bayeux.RequestBase;
 import org.apache.tomcat.bayeux.TomcatBayeux;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.apache.cometd.bayeux.Bayeux;
-import java.util.List;
-import org.apache.cometd.bayeux.Message;
-import java.util.Iterator;
-import org.apache.tomcat.bayeux.*;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
 
 /**
  * Handshake request Bayeux message.
@@ -44,10 +42,10 @@
  * @version 1.0
  *
  */
-public class PublishRequest extends RequestBase implements BayeuxRequest {
-
-JSONObject msgData = null;
+public class PublishRequest extends RequestBase {
 
+private static final Log log = LogFactory.getLog(RequestBase.class);
+
 protected static HashMap responseTemplate = new 
HashMap();
 
 static {
@@ -55,6 +53,8 @@
 responseTemplate.put(Bayeux.ADVICE_FIELD, new HashMap());
 }
 
+JSONObject msgData = null;
+
 public PublishRequest(TomcatBayeux tb, CometEvent event, JSONObject jsReq) 
throws JSONException {
 super(tb, event, jsReq);
 }
@@ -69,6 +69,7 @@
  *  
  * @return HttpError This method returns null if no errors were found
  */
+@Override
 public HttpError validate() {
 if(channel==null|| (!this.getTomcatBayeux().hasChannel(channel)))
 return new HttpError(400,"Channel Id not valid.", null);
@@ -87,6 +88,7 @@
 /**
  *  Send the event message to all registered subscribers.
  */
+@Override
 public int process(int prevops) throws BayeuxException {
 super.process(prevops);
 response = (HashMap)responseTemplate.clone();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org