[jboss-cvs] JBoss Messaging SVN: r5067 - in trunk/src/main/org/jboss/messaging/core: remoting and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 3 14:30:02 EDT 2008
Author: timfox
Date: 2008-10-03 14:30:02 -0400 (Fri, 03 Oct 2008)
New Revision: 5067
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionPacketHandler.java
trunk/src/main/org/jboss/messaging/core/remoting/ChannelHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
Log:
Removed some fluff
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionPacketHandler.java 2008-10-03 18:27:14 UTC (rev 5066)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionPacketHandler.java 2008-10-03 18:30:02 UTC (rev 5067)
@@ -97,8 +97,4 @@
log.error("Failed to handle packet", e);
}
}
-
- public void rehandlePacket(final Packet packet)
- {
- }
}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/remoting/ChannelHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/ChannelHandler.java 2008-10-03 18:27:14 UTC (rev 5066)
+++ trunk/src/main/org/jboss/messaging/core/remoting/ChannelHandler.java 2008-10-03 18:30:02 UTC (rev 5067)
@@ -30,6 +30,4 @@
public interface ChannelHandler
{
void handlePacket(Packet packet);
-
- //void rehandlePacket(Packet packet);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-10-03 18:27:14 UTC (rev 5066)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-10-03 18:30:02 UTC (rev 5067)
@@ -118,8 +118,4 @@
channel1.send(response);
}
-//
-// public void rehandlePacket(final Packet packet)
-// {
-// }
}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-10-03 18:27:14 UTC (rev 5066)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-10-03 18:30:02 UTC (rev 5067)
@@ -51,7 +51,6 @@
import java.util.List;
-import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import org.jboss.messaging.core.exception.MessagingException;
@@ -90,7 +89,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAJoinMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAPrepareMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAResumeMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXARollbackMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
@@ -426,247 +424,5 @@
{
channel.send(response);
}
- }
-
-// public void rehandlePacket(final Packet packet)
-// {
-// Packet response = null;
-// try
-// {
-// byte type = packet.getType();
-//
-// switch (type)
-// {
-// case SESS_CREATECONSUMER:
-// {
-// SessionCreateConsumerMessage request = (SessionCreateConsumerMessage)packet;
-// response = session.recreateConsumer(request.getQueueName(),
-// request.getFilterString(),
-// request.getWindowSize(),
-// request.getMaxRate());
-// break;
-// }
-// case SESS_CREATEQUEUE:
-// {
-// response = new NullResponseMessage(true, true);
-// break;
-// }
-// case SESS_DELETE_QUEUE:
-// {
-// response = new NullResponseMessage(true, true);
-// break;
-// }
-// case SESS_QUEUEQUERY:
-// {
-// SessionQueueQueryMessage request = (SessionQueueQueryMessage)packet;
-// response = session.executeQueueQuery(request.getQueueName());
-// break;
-// }
-// case SESS_BINDINGQUERY:
-// {
-// SessionBindingQueryMessage request = (SessionBindingQueryMessage)packet;
-// response = session.executeBindingQuery(request.getAddress());
-// break;
-// }
-// case SESS_CREATEBROWSER:
-// {
-// response = new NullResponseMessage(false, true);
-// break;
-// }
-// case SESS_CREATEPRODUCER:
-// {
-// SessionCreateProducerMessage request = (SessionCreateProducerMessage)packet;
-// response = session.recreateProducer(request.getAddress(), request.getWindowSize(), request.getMaxRate(), request.isAutoGroupId());
-// break;
-// }
-// case SESS_COMMIT:
-// {
-// response = new NullResponseMessage(false, true);
-// break;
-// }
-// case SESS_ROLLBACK:
-// {
-// response = new NullResponseMessage(false, true);
-// break;
-// }
-// case SESS_XA_COMMIT:
-// {
-// SessionXACommitMessage message = (SessionXACommitMessage)packet;
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_END:
-// {
-// SessionXAEndMessage message = (SessionXAEndMessage)packet;
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_FORGET:
-// {
-// SessionXAForgetMessage message = (SessionXAForgetMessage)packet;
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_JOIN:
-// {
-// SessionXAJoinMessage message = (SessionXAJoinMessage)packet;
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_RESUME:
-// {
-// SessionXAResumeMessage message = (SessionXAResumeMessage)packet;
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_ROLLBACK:
-// {
-// SessionXARollbackMessage message = (SessionXARollbackMessage)packet;
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_START:
-// {
-// SessionXAStartMessage message = (SessionXAStartMessage)packet;
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_SUSPEND:
-// {
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_PREPARE:
-// {
-// SessionXAPrepareMessage message = (SessionXAPrepareMessage)packet;
-// //FIXME - what if the xa operation didn't succeed last time round?
-// //Need to return an xa error code then.
-// //So we need to store the state of the last operation
-//
-// ok ok it's simpler than this!!!
-//
-// no need for having reversions of everything.
-//
-// just store the last response in the server session packet hjandler and send back that
-//
-// response = new SessionXAResponseMessage(false, XAResource.XA_OK, null);
-// break;
-// }
-// case SESS_XA_INDOUBT_XIDS:
-// {
-// List<Xid> xids = session.getInDoubtXids();
-// response = new SessionXAGetInDoubtXidsResponseMessage(xids);
-// break;
-// }
-// case SESS_XA_GET_TIMEOUT:
-// {
-// response = new SessionXAGetTimeoutResponseMessage(session.getXATimeout());
-// break;
-// }
-// case SESS_XA_SET_TIMEOUT:
-// {
-// SessionXASetTimeoutMessage message = (SessionXASetTimeoutMessage)packet;
-// response = new SessionXASetTimeoutResponseMessage(session.setXATimeout(message.getTimeoutSeconds()));
-// break;
-// }
-// case SESS_ADD_DESTINATION:
-// {
-// response = new NullResponseMessage(true, true);
-// break;
-// }
-// case SESS_REMOVE_DESTINATION:
-// {
-// response = new NullResponseMessage(true, true);
-// break;
-// }
-// case SESS_STOP:
-// {
-// response = new NullResponseMessage(false, true);
-// break;
-// }
-// case SESS_CLOSE:
-// {
-// response = new NullResponseMessage(false, true);
-// break;
-// }
-// case SESS_CONSUMER_CLOSE:
-// {
-// response = new NullResponseMessage(true, true);
-// break;
-// }
-// case SESS_PRODUCER_CLOSE:
-// {
-// response = new NullResponseMessage(false, true);
-// break;
-// }
-// case SESS_BROWSER_CLOSE:
-// {
-// response = new NullResponseMessage(false, true);
-// break;
-// }
-// case SESS_SEND:
-// {
-// SessionSendMessage message = (SessionSendMessage)packet;
-// if (message.isRequiresResponse())
-// {
-// response = new NullResponseMessage(false, true);
-// }
-// break;
-// }
-// case SESS_BROWSER_HASNEXTMESSAGE:
-// {
-// //FIXME - this won't work - but we're getting rid of these browser commands anyway so live
-// //with it for now
-// SessionBrowserHasNextMessageMessage message = (SessionBrowserHasNextMessageMessage)packet;
-// response = new SessionBrowserHasNextMessageResponseMessage(session.browserHasNextMessage(message.getBrowserID()));
-// break;
-// }
-// case SESS_BROWSER_NEXTMESSAGE:
-// {
-// //FIXME - this won't work - but we're getting rid of these browser commands anyway so live
-// //with it for now
-// SessionBrowserNextMessageMessage message = (SessionBrowserNextMessageMessage)packet;
-// ServerMessage smsg = session.browserNextMessage(message.getBrowserID());
-// response = new SessionBrowseMessage(smsg);
-// break;
-// }
-// case SESS_BROWSER_RESET:
-// {
-// //FIXME - this won't work - but we're getting rid of these browser commands anyway so live
-// //with it for now
-// SessionBrowserResetMessage message = (SessionBrowserResetMessage)packet;
-// session.browserReset(message.getBrowserID());
-// response = new NullResponseMessage(false, true);
-// break;
-// }
-// default:
-// {
-// response = new MessagingExceptionMessage(new MessagingException(MessagingException.UNSUPPORTED_PACKET,
-// "Unsupported packet on resend " + type));
-// }
-// }
-// }
-// catch (Throwable t)
-// {
-// MessagingException me;
-//
-// log.error("Caught unexpected exception", t);
-//
-// if (t instanceof MessagingException)
-// {
-// me = (MessagingException)t;
-// }
-// else
-// {
-// me = new MessagingException(MessagingException.INTERNAL_ERROR);
-// }
-//
-// response = new MessagingExceptionMessage(me);
-// }
-//
-// if (response != null)
-// {
-// channel.send(response);
-// }
-// }
+ }
}
More information about the jboss-cvs-commits
mailing list