[jboss-cvs] JBoss Messaging SVN: r5972 - in trunk/src/main/org/jboss/messaging/core: remoting/impl/wireformat and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 3 12:44:23 EST 2009
Author: timfox
Date: 2009-03-03 12:44:23 -0500 (Tue, 03 Mar 2009)
New Revision: 5972
Modified:
trunk/src/main/org/jboss/messaging/core/management/impl/AddressControl.java
trunk/src/main/org/jboss/messaging/core/management/impl/BridgeControl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
Log:
a few tweaks
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/AddressControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/AddressControl.java 2009-03-03 16:23:54 UTC (rev 5971)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/AddressControl.java 2009-03-03 17:44:23 UTC (rev 5972)
@@ -117,7 +117,7 @@
return roleInfos;
}
- public void addRole(final String name, final boolean create, final boolean read, final boolean write) throws Exception
+ public synchronized void addRole(final String name, final boolean create, final boolean read, final boolean write) throws Exception
{
Set<Role> roles = securityRepository.getMatch(address.toString());
Role newRole = new Role(name, read, write, create);
@@ -129,7 +129,7 @@
securityRepository.addMatch(address.toString(), roles);
}
- public void removeRole(final String role) throws Exception
+ public synchronized void removeRole(final String role) throws Exception
{
Set<Role> roles = securityRepository.getMatch(address.toString());
Iterator<Role> it = roles.iterator();
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/BridgeControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/BridgeControl.java 2009-03-03 16:23:54 UTC (rev 5971)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/BridgeControl.java 2009-03-03 17:44:23 UTC (rev 5972)
@@ -84,7 +84,6 @@
return configuration.getFilterString();
}
-
public int getMaxRetriesAfterFailover()
{
return configuration.getMaxRetriesAfterFailover();
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2009-03-03 16:23:54 UTC (rev 5971)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2009-03-03 17:44:23 UTC (rev 5972)
@@ -71,94 +71,82 @@
// Session
public static final byte SESS_CREATECONSUMER = 40;
- public static final byte SESS_ACKNOWLEDGE = 44;
+ public static final byte SESS_ACKNOWLEDGE = 41;
- public static final byte SESS_EXPIRED = 45;
+ public static final byte SESS_EXPIRED = 42;
- public static final byte SESS_COMMIT = 46;
+ public static final byte SESS_COMMIT = 43;
- public static final byte SESS_ROLLBACK = 47;
+ public static final byte SESS_ROLLBACK = 44;
- public static final byte SESS_QUEUEQUERY = 48;
+ public static final byte SESS_QUEUEQUERY = 45;
- public static final byte SESS_QUEUEQUERY_RESP = 49;
+ public static final byte SESS_QUEUEQUERY_RESP = 46;
- public static final byte SESS_CREATE_QUEUE = 50;
+ public static final byte SESS_CREATE_QUEUE = 47;
- public static final byte SESS_DELETE_QUEUE = 51;
+ public static final byte SESS_DELETE_QUEUE = 48;
- public static final byte SESS_BINDINGQUERY = 54;
+ public static final byte SESS_BINDINGQUERY = 49;
- public static final byte SESS_BINDINGQUERY_RESP = 55;
+ public static final byte SESS_BINDINGQUERY_RESP = 50;
- public static final byte SESS_XA_START = 56;
+ public static final byte SESS_XA_START = 51;
- public static final byte SESS_XA_END = 57;
+ public static final byte SESS_XA_END = 52;
- public static final byte SESS_XA_COMMIT = 58;
+ public static final byte SESS_XA_COMMIT = 53;
- public static final byte SESS_XA_PREPARE = 59;
+ public static final byte SESS_XA_PREPARE = 54;
- public static final byte SESS_XA_RESP = 60;
+ public static final byte SESS_XA_RESP = 55;
- public static final byte SESS_XA_ROLLBACK = 61;
+ public static final byte SESS_XA_ROLLBACK = 56;
- public static final byte SESS_XA_JOIN = 62;
+ public static final byte SESS_XA_JOIN = 57;
- public static final byte SESS_XA_SUSPEND = 63;
+ public static final byte SESS_XA_SUSPEND = 58;
- public static final byte SESS_XA_RESUME = 64;
+ public static final byte SESS_XA_RESUME = 59;
- public static final byte SESS_XA_FORGET = 65;
+ public static final byte SESS_XA_FORGET = 60;
- public static final byte SESS_XA_INDOUBT_XIDS = 66;
+ public static final byte SESS_XA_INDOUBT_XIDS = 61;
- public static final byte SESS_XA_INDOUBT_XIDS_RESP = 67;
+ public static final byte SESS_XA_INDOUBT_XIDS_RESP = 62;
- public static final byte SESS_XA_SET_TIMEOUT = 68;
+ public static final byte SESS_XA_SET_TIMEOUT = 63;
- public static final byte SESS_XA_SET_TIMEOUT_RESP = 69;
+ public static final byte SESS_XA_SET_TIMEOUT_RESP = 64;
- public static final byte SESS_XA_GET_TIMEOUT = 70;
+ public static final byte SESS_XA_GET_TIMEOUT = 65;
- public static final byte SESS_XA_GET_TIMEOUT_RESP = 71;
+ public static final byte SESS_XA_GET_TIMEOUT_RESP = 66;
- public static final byte SESS_START = 72;
+ public static final byte SESS_START = 67;
- public static final byte SESS_STOP = 73;
+ public static final byte SESS_STOP = 68;
- public static final byte SESS_CLOSE = 74;
+ public static final byte SESS_CLOSE = 69;
- public static final byte SESS_FLOWTOKEN = 75;
+ public static final byte SESS_FLOWTOKEN = 70;
- public static final byte SESS_SEND = 76;
+ public static final byte SESS_SEND = 71;
- public static final byte SESS_SEND_CONTINUATION = 77;
+ public static final byte SESS_SEND_CONTINUATION = 72;
- public static final byte SESS_CONSUMER_CLOSE = 78;
+ public static final byte SESS_CONSUMER_CLOSE = 73;
- public static final byte SESS_RECEIVE_MSG = 79;
+ public static final byte SESS_RECEIVE_MSG = 74;
- public static final byte SESS_RECEIVE_CONTINUATION = 80;
+ public static final byte SESS_RECEIVE_CONTINUATION = 75;
- public static final byte SESS_FAILOVER_COMPLETE = 81;
+ public static final byte SESS_FAILOVER_COMPLETE = 76;
//Replication
- public static final byte SESS_REPLICATE_DELIVERY = 92;
+ public static final byte SESS_REPLICATE_DELIVERY = 91;
- public static final byte REPLICATE_ADDRESS_ADDED = 93;
-
- public static final byte REPLICATE_ADD_DESTINATION = 94;
-
- public static final byte REPLICATE_REMOVE_DESTINATION = 95;
-
- public static final byte REPLICATE_ADD_BINDING = 96;
-
- public static final byte REPLICATE_REMOVE_BINDING = 97;
-
- public static final byte REPLICATE_ROUTE = 98;
-
// Static --------------------------------------------------------
public PacketImpl(final byte type)
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2009-03-03 16:23:54 UTC (rev 5971)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2009-03-03 17:44:23 UTC (rev 5972)
@@ -498,8 +498,7 @@
}
public void handleRollback(final RollbackMessage packet)
- {
-
+ {
if (replicatingChannel == null)
{
doHandleRollback(packet);
More information about the jboss-cvs-commits
mailing list