[jboss-cvs] JBoss Messaging SVN: r2205 - in trunk/src/main/org/jboss: jms/client/delegate and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 8 11:39:30 EST 2007
Author: clebert.suconic at jboss.com
Date: 2007-02-08 11:39:30 -0500 (Thu, 08 Feb 2007)
New Revision: 2205
Modified:
trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/SessionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
trunk/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
trunk/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java
trunk/src/main/org/jboss/jms/wireformat/SessionSendRequest.java
trunk/src/main/org/jboss/messaging/core/plugin/contract/PersistenceManager.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-809 - renaming parameter
Modified: trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -136,7 +136,7 @@
if (methodName.equals("send") &&
target instanceof ClientSessionDelegate)
{
- log.debug("#### Capturing send invocation.. setting retry to true");
+ log.debug("#### Capturing send invocation.. setting check to true");
Object[] arguments = ((MethodInvocation)invocation).getArguments();
arguments[1] = Boolean.TRUE;
((MethodInvocation)invocation).setArguments(arguments);
@@ -145,7 +145,7 @@
if (methodName.equals("sendTransaction") &&
target instanceof ClientConnectionDelegate)
{
- log.debug("#### Capturing sendTransaction invocation.. setting retry to true");
+ log.debug("#### Capturing sendTransaction invocation.. setting check to true");
Object[] arguments = ((MethodInvocation)invocation).getArguments();
arguments[1] = Boolean.TRUE;
((MethodInvocation)invocation).setArguments(arguments);
Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -206,9 +206,11 @@
throw new IllegalStateException("This invocation should not be handled here!");
}
- public void sendTransaction(TransactionRequest request, boolean retry) throws JMSException
+ public void sendTransaction(TransactionRequest request,
+ boolean checkForDuplicates) throws JMSException
{
- RequestSupport req = new ConnectionSendTransactionRequest(id, version, request, retry);
+ RequestSupport req = new ConnectionSendTransactionRequest(id, version, request,
+ checkForDuplicates);
doInvoke(client, req);
}
Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -430,9 +430,9 @@
throw new IllegalStateException("This invocation should not be handled here!");
}
- public void send(JBossMessage m, boolean retry) throws JMSException
+ public void send(JBossMessage m, boolean checkForDuplicates) throws JMSException
{
- RequestSupport req = new SessionSendRequest(id, version, m, retry);
+ RequestSupport req = new SessionSendRequest(id, version, m, checkForDuplicates);
doInvoke(client, req);
}
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -53,7 +53,7 @@
void stop() throws JMSException;
- void sendTransaction(TransactionRequest request, boolean retry) throws JMSException;
+ void sendTransaction(TransactionRequest request, boolean checkForDuplicates) throws JMSException;
MessagingXid[] getPreparedTransactions() throws JMSException;
}
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -418,7 +418,8 @@
log.trace(this + " closing (noop)");
}
- public void sendTransaction(TransactionRequest request, boolean retry) throws JMSException
+ public void sendTransaction(TransactionRequest request,
+ boolean checkForDuplicates) throws JMSException
{
try
{
@@ -432,7 +433,7 @@
if (trace) { log.trace(this + " received ONE_PHASE_COMMIT request"); }
Transaction tx = tr.createTransaction();
- processTransaction(request.getState(), tx, retry);
+ processTransaction(request.getState(), tx, checkForDuplicates);
tx.commit();
}
else if (request.getRequestType() == TransactionRequest.TWO_PHASE_PREPARE_REQUEST)
@@ -440,7 +441,7 @@
if (trace) { log.trace(this + " received TWO_PHASE_COMMIT prepare request"); }
Transaction tx = tr.createTransaction(request.getXid());
- processTransaction(request.getState(), tx, retry);
+ processTransaction(request.getState(), tx, checkForDuplicates);
tx.prepare();
}
else if (request.getRequestType() == TransactionRequest.TWO_PHASE_COMMIT_REQUEST)
@@ -607,7 +608,7 @@
return remotingClientSessionID;
}
- void sendMessage(JBossMessage msg, Transaction tx, boolean retry) throws Exception
+ void sendMessage(JBossMessage msg, Transaction tx, boolean checkForDuplicates) throws Exception
{
JBossDestination dest = (JBossDestination)msg.getJMSDestination();
@@ -617,7 +618,7 @@
// TODO Do we want to set this for ALL messages. Optimisation is possible here.
msg.setConnectionID(id);
- if (retry)
+ if (checkForDuplicates)
{
// Message is already stored... so just ignoring the call
if (serverPeer.getPersistenceManagerInstance().referenceExists(msg.getMessageID()))
@@ -712,7 +713,7 @@
}
private void processTransaction(ClientTransaction txState,
- Transaction tx, boolean retry) throws Throwable
+ Transaction tx, boolean checkForDuplicates) throws Throwable
{
if (trace) { log.trace(this + " processing transaction " + tx); }
@@ -726,7 +727,7 @@
for (Iterator j = sessionState.getMsgs().iterator(); j.hasNext(); )
{
- sendMessage((JBossMessage)j.next(), tx, retry);
+ sendMessage((JBossMessage)j.next(), tx, checkForDuplicates);
}
// send the acks
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -310,11 +310,11 @@
if (trace) log.trace(this + " closing (noop)");
}
- public void send(JBossMessage message, boolean retry) throws JMSException
+ public void send(JBossMessage message, boolean checkForDuplicates) throws JMSException
{
try
{
- connectionEndpoint.sendMessage(message, null, retry);
+ connectionEndpoint.sendMessage(message, null, checkForDuplicates);
}
catch (Throwable t)
{
Modified: trunk/src/main/org/jboss/jms/server/endpoint/SessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/SessionEndpoint.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/server/endpoint/SessionEndpoint.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -123,7 +123,7 @@
* @param message The message to send
* @throws JMSException
*/
- void send(JBossMessage message, boolean retry) throws JMSException;
+ void send(JBossMessage message, boolean checkForDuplicates) throws JMSException;
/**
* Send delivery info to the server so the delivery lists can be repopulated. Used only in
Modified: trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -94,9 +94,10 @@
endpoint.stop();
}
- public void sendTransaction(TransactionRequest request, boolean retry) throws JMSException
+ public void sendTransaction(TransactionRequest request,
+ boolean checkForDuplicates) throws JMSException
{
- endpoint.sendTransaction(request, retry);
+ endpoint.sendTransaction(request, checkForDuplicates);
}
public MessagingXid[] getPreparedTransactions() throws JMSException
Modified: trunk/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -75,9 +75,9 @@
endpoint.closing();
}
- public void send(JBossMessage msg, boolean retry) throws JMSException
+ public void send(JBossMessage msg, boolean checkForDuplicates) throws JMSException
{
- endpoint.send(msg, retry);
+ endpoint.send(msg, checkForDuplicates);
}
public ConsumerDelegate createConsumerDelegate(JBossDestination destination, String selector,
Modified: trunk/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -44,7 +44,7 @@
private TransactionRequest req;
- private boolean retry;
+ private boolean checkForDuplicates;
public ConnectionSendTransactionRequest()
{
@@ -53,12 +53,12 @@
public ConnectionSendTransactionRequest(int objectId,
byte version,
TransactionRequest req,
- boolean retry)
+ boolean checkForDuplicates)
{
super(objectId, PacketSupport.REQ_CONNECTION_SENDTRANSACTION, version);
this.req = req;
- this.retry = retry;
+ this.checkForDuplicates = checkForDuplicates;
}
public void read(DataInputStream is) throws Exception
@@ -69,7 +69,7 @@
req.read(is);
- retry = is.readBoolean();
+ checkForDuplicates = is.readBoolean();
}
public ResponseSupport serverInvoke() throws Exception
@@ -82,7 +82,7 @@
throw new IllegalStateException("Cannot find object in dispatcher with id " + objectId);
}
- endpoint.sendTransaction(req, retry);
+ endpoint.sendTransaction(req, checkForDuplicates);
return null;
}
@@ -93,7 +93,7 @@
req.write(os);
- os.writeBoolean(retry);
+ os.writeBoolean(checkForDuplicates);
os.flush();
}
Modified: trunk/src/main/org/jboss/jms/wireformat/SessionSendRequest.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/SessionSendRequest.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/jms/wireformat/SessionSendRequest.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -46,7 +46,7 @@
private JBossMessage msg;
- private boolean retry;
+ private boolean checkForDuplicates;
public SessionSendRequest()
{
@@ -55,11 +55,11 @@
public SessionSendRequest(int objectId,
byte version,
JBossMessage msg,
- boolean retry)
+ boolean checkForDuplicates)
{
super(objectId, PacketSupport.REQ_SESSION_SEND, version);
this.msg = msg;
- this.retry = retry;
+ this.checkForDuplicates = checkForDuplicates;
}
public void read(DataInputStream is) throws Exception
@@ -72,7 +72,7 @@
msg.read(is);
- retry = is.readBoolean();
+ checkForDuplicates = is.readBoolean();
}
public ResponseSupport serverInvoke() throws Exception
@@ -85,7 +85,7 @@
throw new IllegalStateException("Cannot find object in dispatcher with id " + objectId);
}
- endpoint.send(msg, retry);
+ endpoint.send(msg, checkForDuplicates);
return null;
}
@@ -98,7 +98,7 @@
msg.write(os);
- os.writeBoolean(retry);
+ os.writeBoolean(checkForDuplicates);
os.flush();
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/contract/PersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/contract/PersistenceManager.java 2007-02-08 14:21:08 UTC (rev 2204)
+++ trunk/src/main/org/jboss/messaging/core/plugin/contract/PersistenceManager.java 2007-02-08 16:39:30 UTC (rev 2205)
@@ -80,7 +80,7 @@
boolean referenceExists(long channelID, long messageID) throws Exception;
- // Failover elated functionality (retry on send)
+ // Failover elated functionality (checkDuplicates on send)
boolean referenceExists(long messageID) throws Exception;
More information about the jboss-cvs-commits
mailing list