You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/10/21 10:10:54 UTC
svn commit: r1765980 - in /qpid/java/branches/transfer-queue: ./
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/security/ broker-c...
Author: rgodfrey
Date: Fri Oct 21 10:10:53 2016
New Revision: 1765980
URL: http://svn.apache.org/viewvc?rev=1765980&view=rev
Log:
merge up to r1763765 from trunk
Modified:
qpid/java/branches/transfer-queue/ (props changed)
qpid/java/branches/transfer-queue/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/security/CompoundSecurityToken.java
qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
qpid/java/branches/transfer-queue/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
Propchange: qpid/java/branches/transfer-queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 10:10:53 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1763546-1763622
+/qpid/java/trunk:1763546-1763765
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/transfer-queue/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/transfer-queue/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1765980&r1=1765979&r2=1765980&view=diff
==============================================================================
--- qpid/java/branches/transfer-queue/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/java/branches/transfer-queue/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Fri Oct 21 10:10:53 2016
@@ -1348,11 +1348,14 @@ public abstract class AbstractBDBMessage
private void doPostCommitActions()
{
- for(Runnable action : _postCommitActions)
+ if (!_postCommitActions.isEmpty())
{
- action.run();
+ for (Runnable action : _postCommitActions)
+ {
+ action.run();
+ }
+ _postCommitActions.clear();
}
- _postCommitActions.clear();
}
@Override
Modified: qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1765980&r1=1765979&r2=1765980&view=diff
==============================================================================
--- qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Fri Oct 21 10:10:53 2016
@@ -2888,8 +2888,8 @@ public abstract class AbstractConfigured
LOGGER.debug("authorise returned {}", result);
if (result == Result.DEFER)
{
- LOGGER.debug("authorise returned DEFER, returing default: {}", accessControl.getDefault());
result = accessControl.getDefault();
+ LOGGER.debug("authorise returned DEFER, returing default: {}", result);
}
if (result == Result.DENIED)
Modified: qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/security/CompoundSecurityToken.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/security/CompoundSecurityToken.java?rev=1765980&r1=1765979&r2=1765980&view=diff
==============================================================================
--- qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/security/CompoundSecurityToken.java (original)
+++ qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/security/CompoundSecurityToken.java Fri Oct 21 10:10:53 2016
@@ -42,19 +42,15 @@ class CompoundSecurityToken implements S
}
- Map<AccessControl<?>, SecurityToken> getCompoundToken(final List<AccessControl<?>> underlying)
+ Map<AccessControl<?>, SecurityToken> getCompoundToken(final List<AccessControl<?>> accessControls)
{
CompoundTokenMapReference ref = _reference.get();
- if(ref.getAccessControlList() != underlying)
+ if (ref.getAccessControlList() != accessControls)
{
- CompoundTokenMapReference oldRef;
- do
- {
- oldRef = ref;
- ref = new CompoundTokenMapReference(underlying);
-
- } while(!_reference.compareAndSet(oldRef,ref));
+ CompoundTokenMapReference oldRef = ref;
+ ref = new CompoundTokenMapReference(accessControls);
ref.init(_subject);
+ _reference.compareAndSet(oldRef, ref);
}
return ref.getCompoundTokenMap();
}
Modified: qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1765980&r1=1765979&r2=1765980&view=diff
==============================================================================
--- qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Fri Oct 21 10:10:53 2016
@@ -1193,11 +1193,14 @@ public abstract class AbstractJDBCMessag
private void doPostCommitActions()
{
- for(Runnable action : _postCommitActions)
+ if (!_postCommitActions.isEmpty())
{
- action.run();
+ for (Runnable action : _postCommitActions)
+ {
+ action.run();
+ }
+ _postCommitActions.clear();
}
- _postCommitActions.clear();
}
@Override
Modified: qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java?rev=1765980&r1=1765979&r2=1765980&view=diff
==============================================================================
--- qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java (original)
+++ qpid/java/branches/transfer-queue/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java Fri Oct 21 10:10:53 2016
@@ -330,13 +330,16 @@ class SelectorThread extends Thread
{
clearSelecting();
}
- _workQueue.addAll(connections);
- _workQueue.add(this);
- for (ConnectionProcessor connectionProcessor : connections)
+
+ if (!connections.isEmpty())
{
- connectionProcessor.processConnection();
+ _workQueue.addAll(connections);
+ _workQueue.add(this);
+ for (ConnectionProcessor connectionProcessor : connections)
+ {
+ connectionProcessor.processConnection();
+ }
}
-
}
else
{
Modified: qpid/java/branches/transfer-queue/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/transfer-queue/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java?rev=1765980&r1=1765979&r2=1765980&view=diff
==============================================================================
--- qpid/java/branches/transfer-queue/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java (original)
+++ qpid/java/branches/transfer-queue/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java Fri Oct 21 10:10:53 2016
@@ -33,10 +33,12 @@ public class MessageTransferMessage exte
{
private final static MessageMetaData_0_10 DELETED_MESSAGE_METADATA = new MessageMetaData_0_10(null, 0, 0);
+ private final long _size;
public MessageTransferMessage(StoredMessage<MessageMetaData_0_10> storeMessage, Object connectionRef)
{
super(storeMessage, connectionRef);
+ _size = storeMessage.getMetaData().getSize();
}
private MessageMetaData_0_10 getMetaData()
@@ -58,7 +60,7 @@ public class MessageTransferMessage exte
public long getSize()
{
- return getMetaData().getSize();
+ return _size;
}
public boolean isImmediate()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org