[jboss-cvs] JBoss Messaging SVN: r4528 - in trunk: src/main/org/jboss/messaging/core/server/impl and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 19 15:56:52 EDT 2008
Author: timfox
Date: 2008-06-19 15:56:52 -0400 (Thu, 19 Jun 2008)
New Revision: 4528
Modified:
trunk/src/main/org/jboss/messaging/core/server/ServerSession.java
trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerConnectionImplTest.java
Log:
More tests
Modified: trunk/src/main/org/jboss/messaging/core/server/ServerSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/ServerSession.java 2008-06-19 16:20:53 UTC (rev 4527)
+++ trunk/src/main/org/jboss/messaging/core/server/ServerSession.java 2008-06-19 19:56:52 UTC (rev 4528)
@@ -48,8 +48,6 @@
{
long getID();
- ServerConnection getConnection();
-
void removeBrowser(ServerBrowserImpl browser) throws Exception;
void removeConsumer(ServerConsumer consumer) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-06-19 16:20:53 UTC (rev 4527)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-06-19 19:56:52 UTC (rev 4528)
@@ -76,7 +76,7 @@
message.setTargetID(consumerID);
message.setExecutorID(sessionID);
-
+
sender.send(message);
}
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-06-19 16:20:53 UTC (rev 4527)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-06-19 19:56:52 UTC (rev 4528)
@@ -347,8 +347,6 @@
long sessionID = returner.getSessionID();
- log.info("****Session id is " + sessionID);
-
final ServerConnection connection =
new ServerConnectionImpl(username, password, sessionID,
postOffice, connectionManager,
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-06-19 16:20:53 UTC (rev 4527)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-06-19 19:56:52 UTC (rev 4528)
@@ -57,7 +57,6 @@
import org.jboss.messaging.core.security.SecurityStore;
import org.jboss.messaging.core.server.Delivery;
import org.jboss.messaging.core.server.MessageReference;
-import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerConnection;
import org.jboss.messaging.core.server.ServerConsumer;
@@ -135,7 +134,7 @@
private final SecurityStore securityStore;
private final PacketDispatcher dispatcher;
-
+
// Constructors
// ---------------------------------------------------------------------------------
@@ -175,9 +174,9 @@
this.id = dispatcher.generateID();
this.executor = executor;
-
+
if (!xa)
- {
+ {
tx = new TransactionImpl(storageManager, postOffice);
}
}
@@ -190,11 +189,6 @@
return id;
}
- public ServerConnection getConnection()
- {
- return connection;
- }
-
public void removeBrowser(final ServerBrowserImpl browser) throws Exception
{
if (!browsers.remove(browser))
@@ -295,8 +289,7 @@
try
{
securityStore.check(msg.getDestination(), CheckType.WRITE, connection);
- }
-
+ }
catch (MessagingException e)
{
if (!autoCommitSends)
@@ -376,7 +369,7 @@
}
if (autoCommitAcks)
- {
+ {
doAck(ref);
}
else
@@ -562,8 +555,6 @@
{
tx = new TransactionImpl(storageManager, postOffice);
}
-
-
}
public SessionXAResponseMessage XACommit(final boolean onePhase, final Xid xid) throws Exception
@@ -1147,6 +1138,16 @@
{
return "SessionEndpoint[" + id + "]";
}
+
+ public Transaction getTransaction()
+ {
+ return tx;
+ }
+
+ public java.util.Queue<Delivery> getDeliveries()
+ {
+ return deliveries;
+ }
// Private --------------------------------------------------------------------------------------------
@@ -1155,7 +1156,7 @@
ServerMessage message = ref.getMessage();
Queue queue = ref.getQueue();
-
+
if (message.isDurable() && queue.isDurable())
{
int count = message.decrementDurableRefCount();
@@ -1172,6 +1173,4 @@
queue.referenceAcknowledged(ref);
}
-
-
}
Modified: trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java 2008-06-19 16:20:53 UTC (rev 4527)
+++ trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java 2008-06-19 19:56:52 UTC (rev 4528)
@@ -140,9 +140,9 @@
synchronized (message)
{
- message.decrementDurableRefCount();
+ int count = message.decrementDurableRefCount();
- if (message.getDurableRefCount() == 0)
+ if (count == 0)
{
storageManager.storeDeleteTransactional(id, message
.getMessageID());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerConnectionImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerConnectionImplTest.java 2008-06-19 16:20:53 UTC (rev 4527)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerConnectionImplTest.java 2008-06-19 19:56:52 UTC (rev 4528)
@@ -396,7 +396,7 @@
EasyMock.expect(pd.generateID()).andReturn(sessionID);
- if(!xa)
+ if (!xa)
{
EasyMock.expect(sm.generateTransactionID()).andReturn(8172L);
}
More information about the jboss-cvs-commits
mailing list