[qpid-dispatch] branch dependabot/npm_and_yarn/console/react/patternfly/patternfly-4.108.2 created (now 2866f64)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/console/react/patternfly/patternfly-4.108.2 in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git. at 2866f64 Bump @patternfly/patternfly from 4.102.2 to 4.108.2 in /console/react No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/03: QPID-8525:[Broker-J]Fixed child deletion issue in group providers
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 870e05b04b1db3347e439ac8c0c677c01de497be
Author: Dedeepya T
AuthorDate: Tue Jun 8 10:53:18 2021 +0530
QPID-8525:[Broker-J]Fixed child deletion issue in group providers
This closes #88
(cherry picked from commit db639ff523b2cf28f8a64b2d06e54b5534182111)
---
.../model/adapter/FileBasedGroupProviderImpl.java | 14 +-
.../server/security/group/FileGroupDatabase.java | 57 ++--
.../adapter/FileBasedGroupProviderImplTest.java| 156 ++---
.../FileGroupDatabaseCaseInsensitiveTest.java | 29 +++-
.../security/group/FileGroupDatabaseTest.java | 13 +-
5 files changed, 213 insertions(+), 56 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
index 7760f7b..8e108ec 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
@@ -203,19 +203,19 @@ public class FileBasedGroupProviderImpl
if (getState() != State.ACTIVE)
{
-throw new IllegalConfigurationException(String.format("Group
provider '%s' is not activated. Cannot create a group.", getName()));
+throw new IllegalConfigurationException(String.format(
+"Group provider '%s' is not activated. Cannot create a
group.",
+getName()));
}
-
_groupDatabase.createGroup(groupName);
-Map attrMap = new HashMap();
+Map attrMap = new HashMap();
UUID id = UUID.randomUUID();
attrMap.put(ConfiguredObject.ID, id);
attrMap.put(ConfiguredObject.NAME, groupName);
GroupAdapter groupAdapter = new GroupAdapter(attrMap);
groupAdapter.create();
return Futures.immediateFuture((C) groupAdapter);
-
}
else
{
@@ -359,16 +359,14 @@ public class FileBasedGroupProviderImpl
if (childClass == GroupMember.class)
{
String memberName = (String) attributes.get(GroupMember.NAME);
-
_groupDatabase.addUserToGroup(memberName, getName());
UUID id = UUID.randomUUID();
-Map attrMap = new HashMap();
-attrMap.put(GroupMember.ID,id);
+Map attrMap = new HashMap();
+attrMap.put(GroupMember.ID, id);
attrMap.put(GroupMember.NAME, memberName);
GroupMemberAdapter groupMemberAdapter = new
GroupMemberAdapter(attrMap);
groupMemberAdapter.create();
return Futures.immediateFuture((C) groupMemberAdapter);
-
}
else
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
b/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
index 8f08ccb..8d908e6 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
@@ -36,6 +36,7 @@ import com.google.common.base.Joiner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.adapter.FileBasedGroupProvider;
import org.apache.qpid.server.util.BaseAction;
import org.apache.qpid.server.util.FileHelper;
@@ -104,8 +105,10 @@ public class FileGroupDatabase implements GroupDatabase
@Override
public synchronized void addUserToGroup(String user, String group)
{
-Set users =
_groupToUserMap.get(keySearch(_groupToUserMap.keySet(), group));
-if (users == null)
+final String groupKey = keySearch(_groupToUserMap.keySet(), group);
+Set groupUsers = _groupToUserMap.get(groupKey);
+final String userKey = keySearch(_userToGroupMap.keySet(), user);
+if (groupUsers == null)
{
throw new IllegalArgumentException("Group "
+ group
@@ -113,16 +116,30 @@ public class FileGroupDatabase implements GroupDatabase
+ user
+ " to it");
}
+else if (groupUsers.contains(userKey))
+{
+throw new IllegalConfigurationException(String.format("Group
member with name '%s' already exists", user));
+}
-users.add(keySearch(users, user));
-
-Set group
[qpid-broker-j] 03/03: NO-JIRA: Fix maven execution settings in conversion tests
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit ec80faec748c4ddc5855fdcd42139f4884bc6d98
Author: Alex Rudyy
AuthorDate: Sat May 29 19:57:48 2021 +0100
NO-JIRA: Fix maven execution settings in conversion tests
---
systests/end-to-end-conversion-tests/pom.xml | 27 +--
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/systests/end-to-end-conversion-tests/pom.xml
b/systests/end-to-end-conversion-tests/pom.xml
index bf71ee8..1133267 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -88,11 +88,15 @@
classpath:config-end-to-end-conversion-tests.json
${settings.localRepository}
https://repo.maven.apache.org/maven2/
+
${qpid-jms-client-version}
+
${qpid-jms-client-amqp-0-x-version}
+false
+6
-0-9-1 -> 1.0
+default-test
${skipITs}
@@ -108,7 +112,7 @@
-1.0 -> 0-9-1
+1.0_to_0-9-1
${skipITs}
@@ -124,7 +128,7 @@
-0-10 -> 1.0
+0-10_to_1.0
${skipITs}
@@ -140,7 +144,7 @@
-1.0 -> 0-10
+1.0_to_0-10
${skipITs}
@@ -156,7 +160,7 @@
-0-9-1 -> 0-10
+0-9-1_to_0-10
${skipITs}
@@ -172,7 +176,7 @@
-0-10 -> 0-9-1
+0-10_to_0-9-1
${skipITs}
@@ -187,6 +191,17 @@
test
+
+integration-test
+
+test
+
+
+
+**
+
+
+
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated (a83f2cb -> ec80fae)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from a83f2cb QPID-8537: replace use of constructors marked deprecated-for-removal new 870e05b QPID-8525:[Broker-J]Fixed child deletion issue in group providers new b5ed920 QPID-8525:[Broker-J] Code cleanup new ec80fae NO-JIRA: Fix maven execution settings in conversion tests The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../model/adapter/FileBasedGroupProviderImpl.java | 14 +- .../server/security/group/FileGroupDatabase.java | 71 -- .../adapter/FileBasedGroupProviderImplTest.java| 251 - .../FileGroupDatabaseCaseInsensitiveTest.java | 36 ++- .../security/group/FileGroupDatabaseTest.java | 14 +- systests/end-to-end-conversion-tests/pom.xml | 27 ++- 6 files changed, 255 insertions(+), 158 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/03: QPID-8525:[Broker-J] Code cleanup
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit b5ed920367e9c50af171b70036889b5221986895
Author: Alex Rudyy
AuthorDate: Wed Jun 9 00:10:32 2021 +0100
QPID-8525:[Broker-J] Code cleanup
(cherry picked from commit a36fea373e043a0fd8e4b9d16382056c4c5ddb8e)
---
.../server/security/group/FileGroupDatabase.java | 18 +-
.../adapter/FileBasedGroupProviderImplTest.java| 237 +++--
.../FileGroupDatabaseCaseInsensitiveTest.java | 17 +-
.../security/group/FileGroupDatabaseTest.java | 1 -
4 files changed, 99 insertions(+), 174 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
b/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
index 8d908e6..f8fce88 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
@@ -106,15 +106,13 @@ public class FileGroupDatabase implements GroupDatabase
public synchronized void addUserToGroup(String user, String group)
{
final String groupKey = keySearch(_groupToUserMap.keySet(), group);
-Set groupUsers = _groupToUserMap.get(groupKey);
+final Set groupUsers = _groupToUserMap.get(groupKey);
final String userKey = keySearch(_userToGroupMap.keySet(), user);
if (groupUsers == null)
{
-throw new IllegalArgumentException("Group "
- + group
- + " does not exist so could not
add "
- + user
- + " to it");
+throw new IllegalArgumentException(String.format("Group %s does
not exist so could not add %s to it",
+ group,
+ user));
}
else if (groupUsers.contains(userKey))
{
@@ -136,7 +134,7 @@ public class FileGroupDatabase implements GroupDatabase
Set groups = _userToGroupMap.get(userKey);
if (groups == null)
{
-groups = new ConcurrentSkipListSet();
+groups = new ConcurrentSkipListSet<>();
_userToGroupMap.put(user, groups);
}
groups.add(groupKey);
@@ -193,7 +191,7 @@ public class FileGroupDatabase implements GroupDatabase
{
if (!exists(group, _groupToUserMap.keySet()))
{
-Set users = new ConcurrentSkipListSet();
+Set users = new ConcurrentSkipListSet<>();
_groupToUserMap.put(group, users);
update();
}
@@ -274,7 +272,7 @@ public class FileGroupDatabase implements GroupDatabase
if (groupsForThisUser == null)
{
-groupsForThisUser = new ConcurrentSkipListSet();
+groupsForThisUser = new ConcurrentSkipListSet<>();
_userToGroupMap.put(userName, groupsForThisUser);
}
@@ -322,7 +320,7 @@ public class FileGroupDatabase implements GroupDatabase
private ConcurrentSkipListSet
buildUserSetFromCommaSeparateValue(String userString)
{
String[] users = userString.split(",");
-final ConcurrentSkipListSet userSet = new
ConcurrentSkipListSet();
+final ConcurrentSkipListSet userSet = new
ConcurrentSkipListSet<>();
for (String user : users)
{
final String trimmed = user.trim();
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
index 410c913..e7d2057 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
@@ -23,12 +23,12 @@ package org.apache.qpid.server.model.adapter;
import static
org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.whe
[qpid-broker-j] 02/02: QPID-8525:[Broker-J] Code cleanup
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit a36fea373e043a0fd8e4b9d16382056c4c5ddb8e
Author: Alex Rudyy
AuthorDate: Wed Jun 9 00:10:32 2021 +0100
QPID-8525:[Broker-J] Code cleanup
---
.../server/security/group/FileGroupDatabase.java | 18 +-
.../adapter/FileBasedGroupProviderImplTest.java| 237 +++--
.../FileGroupDatabaseCaseInsensitiveTest.java | 17 +-
.../security/group/FileGroupDatabaseTest.java | 1 -
4 files changed, 99 insertions(+), 174 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
b/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
index 8d908e6..f8fce88 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
@@ -106,15 +106,13 @@ public class FileGroupDatabase implements GroupDatabase
public synchronized void addUserToGroup(String user, String group)
{
final String groupKey = keySearch(_groupToUserMap.keySet(), group);
-Set groupUsers = _groupToUserMap.get(groupKey);
+final Set groupUsers = _groupToUserMap.get(groupKey);
final String userKey = keySearch(_userToGroupMap.keySet(), user);
if (groupUsers == null)
{
-throw new IllegalArgumentException("Group "
- + group
- + " does not exist so could not
add "
- + user
- + " to it");
+throw new IllegalArgumentException(String.format("Group %s does
not exist so could not add %s to it",
+ group,
+ user));
}
else if (groupUsers.contains(userKey))
{
@@ -136,7 +134,7 @@ public class FileGroupDatabase implements GroupDatabase
Set groups = _userToGroupMap.get(userKey);
if (groups == null)
{
-groups = new ConcurrentSkipListSet();
+groups = new ConcurrentSkipListSet<>();
_userToGroupMap.put(user, groups);
}
groups.add(groupKey);
@@ -193,7 +191,7 @@ public class FileGroupDatabase implements GroupDatabase
{
if (!exists(group, _groupToUserMap.keySet()))
{
-Set users = new ConcurrentSkipListSet();
+Set users = new ConcurrentSkipListSet<>();
_groupToUserMap.put(group, users);
update();
}
@@ -274,7 +272,7 @@ public class FileGroupDatabase implements GroupDatabase
if (groupsForThisUser == null)
{
-groupsForThisUser = new ConcurrentSkipListSet();
+groupsForThisUser = new ConcurrentSkipListSet<>();
_userToGroupMap.put(userName, groupsForThisUser);
}
@@ -322,7 +320,7 @@ public class FileGroupDatabase implements GroupDatabase
private ConcurrentSkipListSet
buildUserSetFromCommaSeparateValue(String userString)
{
String[] users = userString.split(",");
-final ConcurrentSkipListSet userSet = new
ConcurrentSkipListSet();
+final ConcurrentSkipListSet userSet = new
ConcurrentSkipListSet<>();
for (String user : users)
{
final String trimmed = user.trim();
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
index 410c913..e7d2057 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
@@ -23,12 +23,12 @@ package org.apache.qpid.server.model.adapter;
import static
org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
@@ -46,7 +46,6 @@ import java.util.stream.Collectors;
import com.google.c
[qpid-broker-j] 01/02: QPID-8525:[Broker-J]Fixed child deletion issue in group providers
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit db639ff523b2cf28f8a64b2d06e54b5534182111
Author: Dedeepya T
AuthorDate: Tue Jun 8 10:53:18 2021 +0530
QPID-8525:[Broker-J]Fixed child deletion issue in group providers
This closes #88
---
.../model/adapter/FileBasedGroupProviderImpl.java | 14 +-
.../server/security/group/FileGroupDatabase.java | 57 ++--
.../adapter/FileBasedGroupProviderImplTest.java| 156 ++---
.../FileGroupDatabaseCaseInsensitiveTest.java | 29 +++-
.../security/group/FileGroupDatabaseTest.java | 13 +-
5 files changed, 213 insertions(+), 56 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
index 7760f7b..8e108ec 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
@@ -203,19 +203,19 @@ public class FileBasedGroupProviderImpl
if (getState() != State.ACTIVE)
{
-throw new IllegalConfigurationException(String.format("Group
provider '%s' is not activated. Cannot create a group.", getName()));
+throw new IllegalConfigurationException(String.format(
+"Group provider '%s' is not activated. Cannot create a
group.",
+getName()));
}
-
_groupDatabase.createGroup(groupName);
-Map attrMap = new HashMap();
+Map attrMap = new HashMap();
UUID id = UUID.randomUUID();
attrMap.put(ConfiguredObject.ID, id);
attrMap.put(ConfiguredObject.NAME, groupName);
GroupAdapter groupAdapter = new GroupAdapter(attrMap);
groupAdapter.create();
return Futures.immediateFuture((C) groupAdapter);
-
}
else
{
@@ -359,16 +359,14 @@ public class FileBasedGroupProviderImpl
if (childClass == GroupMember.class)
{
String memberName = (String) attributes.get(GroupMember.NAME);
-
_groupDatabase.addUserToGroup(memberName, getName());
UUID id = UUID.randomUUID();
-Map attrMap = new HashMap();
-attrMap.put(GroupMember.ID,id);
+Map attrMap = new HashMap();
+attrMap.put(GroupMember.ID, id);
attrMap.put(GroupMember.NAME, memberName);
GroupMemberAdapter groupMemberAdapter = new
GroupMemberAdapter(attrMap);
groupMemberAdapter.create();
return Futures.immediateFuture((C) groupMemberAdapter);
-
}
else
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
b/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
index 8f08ccb..8d908e6 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
@@ -36,6 +36,7 @@ import com.google.common.base.Joiner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.adapter.FileBasedGroupProvider;
import org.apache.qpid.server.util.BaseAction;
import org.apache.qpid.server.util.FileHelper;
@@ -104,8 +105,10 @@ public class FileGroupDatabase implements GroupDatabase
@Override
public synchronized void addUserToGroup(String user, String group)
{
-Set users =
_groupToUserMap.get(keySearch(_groupToUserMap.keySet(), group));
-if (users == null)
+final String groupKey = keySearch(_groupToUserMap.keySet(), group);
+Set groupUsers = _groupToUserMap.get(groupKey);
+final String userKey = keySearch(_userToGroupMap.keySet(), user);
+if (groupUsers == null)
{
throw new IllegalArgumentException("Group "
+ group
@@ -113,16 +116,30 @@ public class FileGroupDatabase implements GroupDatabase
+ user
+ " to it");
}
+else if (groupUsers.contains(userKey))
+{
+throw new IllegalConfigurationException(String.format("Group
member with name '%s' already exists", user));
+}
-users.add(keySearch(users, user));
-
-Set groups =
_userToGroupMap.get(keySearch(_userToGroupMap.keySet(), user));
+f
[qpid-broker-j] branch main updated (42abe9f -> a36fea3)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from 42abe9f QPID-8537: replace use of constructors marked deprecated-for-removal new db639ff QPID-8525:[Broker-J]Fixed child deletion issue in group providers new a36fea3 QPID-8525:[Broker-J] Code cleanup The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../model/adapter/FileBasedGroupProviderImpl.java | 14 +- .../server/security/group/FileGroupDatabase.java | 71 -- .../adapter/FileBasedGroupProviderImplTest.java| 251 - .../FileGroupDatabaseCaseInsensitiveTest.java | 36 ++- .../security/group/FileGroupDatabaseTest.java | 14 +- 5 files changed, 234 insertions(+), 152 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch main updated: DISPATCH-1878: Account for new dispositions used for flow control
This is an automated email from the ASF dual-hosted git repository.
chug pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new 9e87b89 DISPATCH-1878: Account for new dispositions used for flow
control
9e87b89 is described below
commit 9e87b8994d29cfba97789a246e5df20c4ac29cab
Author: Chuck Rolke
AuthorDate: Tue Jun 8 10:48:12 2021 -0400
DISPATCH-1878: Account for new dispositions used for flow control
Non-terminal RECEIVED dispositions used for TCP flow control generate
new disposition states. This patch closes the TCP connection upon
receiving RELEASED settlement and not on MODIFIED settlement.
---
src/adaptors/tcp_adaptor.c | 11 +--
src/router_node.c | 1 -
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/adaptors/tcp_adaptor.c b/src/adaptors/tcp_adaptor.c
index 940d65f..c262088 100644
--- a/src/adaptors/tcp_adaptor.c
+++ b/src/adaptors/tcp_adaptor.c
@@ -1485,12 +1485,11 @@ static void qdr_tcp_delivery_update(void *context,
qdr_delivery_t *dlv, uint64_t
DLV_FMT" qdr_tcp_delivery_update: disp: %"PRIu64", settled: %s",
DLV_ARGS(dlv), disp, settled ? "true" : "false");
-if (settled) {
-// the only settlement occurs when the initial delivery is
-// settled, which occurs when the connector is unable to
-// connect to the configured tcp endpoint, so in this case
-// we can just close the connection
-// (The end of the message is used to convey half closed status)
+if (settled && disp == PN_RELEASED) {
+// When the connector is unable to connect to a tcp endpoint it
will
+// release the message. We handle that here by closing the
connection.
+// Half-closed status is signalled by read_eos_seen and is not
+// sufficient by itself to force a connection closure.
qd_log(tcp_adaptor->log_source, QD_LOG_DEBUG,
DLV_FMT" qdr_tcp_delivery_update: call
pn_raw_connection_close()",
DLV_ARGS(dlv));
diff --git a/src/router_node.c b/src/router_node.c
index 44f13cf..6df6679 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -2067,7 +2067,6 @@ static void CORE_delivery_update(void *context,
qdr_delivery_t *dlv, uint64_t di
if (disp && !pn_delivery_settled(pnd)) {
uint64_t ignore = 0;
qd_delivery_state_t *dstate =
qdr_delivery_take_local_delivery_state(dlv, &ignore);
-assert(ignore == disp); // expected: since both are from the same dlv
// update if the disposition has changed or there is new state
associated with it
if (disp != pn_delivery_local_state(pnd) || dstate) {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch main updated: DISPATCH-2066: unblock Q2 on setting message receive complete
This is an automated email from the ASF dual-hosted git repository.
kgiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new fff5513 DISPATCH-2066: unblock Q2 on setting message receive complete
fff5513 is described below
commit fff55137564fc11cc1ea6949ad27d678dc7d56d1
Author: Kenneth Giusti
AuthorDate: Tue Jun 8 11:45:53 2021 -0400
DISPATCH-2066: unblock Q2 on setting message receive complete
This closes #1247
---
src/message.c | 8
1 file changed, 8 insertions(+)
diff --git a/src/message.c b/src/message.c
index 37d8370..edf1355 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1327,14 +1327,22 @@ void qd_message_set_receive_complete(qd_message_t
*in_msg)
{
if (!!in_msg) {
qd_message_content_t *content = MSG_CONTENT(in_msg);
+qd_message_q2_unblocker_t q2_unblock = {0};
LOCK(content->lock);
content->receive_complete = true;
+if (content->q2_input_holdoff) {
+content->q2_input_holdoff = false;
+q2_unblock = content->q2_unblocker;
+}
content->q2_unblocker.handler = 0;
qd_nullify_safe_ptr(&content->q2_unblocker.context);
UNLOCK(content->lock);
+
+if (q2_unblock.handler)
+q2_unblock.handler(q2_unblock.context);
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated: QPID-8537: replace use of constructors marked deprecated-for-removal
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new a83f2cb QPID-8537: replace use of constructors marked
deprecated-for-removal
a83f2cb is described below
commit a83f2cba0f6ffcdef26326e12e3d5ace36a18ef3
Author: Robbie Gemmell
AuthorDate: Tue Jun 8 11:22:50 2021 +0100
QPID-8537: replace use of constructors marked deprecated-for-removal
(cherry picked from commit 42abe9fdd53e758574ddd68a6c0a88e05c88d214)
---
.../store/berkeleydb/BDBHAVirtualHostNodeTest.java | 2 +-
.../upgrade/AbstractUpgradeTestCase.java | 2 +-
.../berkeleydb/upgrade/MapJsonSerializerTest.java | 4 +-
.../berkeleydb/replication/MultiNodeTest.java | 6 +-
.../qpid/server/filter/ConstantExpression.java | 2 +-
.../qpid/server/queue/AbstractQueueTestBase.java | 88 +++---
.../org/apache/qpid/server/store/TestRecord.java | 2 +-
.../apache/qpid/server/protocol/v0_8/AMQType.java | 2 +-
.../management/amqp/ManagementInputConverter.java | 12 +--
.../src/main/markdown/code-guide.md| 2 +-
.../qpid/disttest/client/MessageProviderTest.java | 6 +-
.../client/property/ListPropertyValueTest.java | 26 +++
.../client/property/RandomPropertyValueTest.java | 4 +-
.../client/property/RangePropertyValueTest.java| 6 +-
.../client/property/SimplePropertyValueTest.java | 22 +-
.../qpid/disttest/message/JsonHandlerTest.java | 2 +-
16 files changed, 87 insertions(+), 101 deletions(-)
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
index 1609c7c..9e457f5 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
@@ -829,7 +829,7 @@ public class BDBHAVirtualHostNodeTest extends UnitTestBase
Thread.sleep(100l);
}
assertEquals("Last transaction was not replicated",
-new
Long(remote.getLastKnownReplicationTransactionId()),
+
Long.valueOf(remote.getLastKnownReplicationTransactionId()),
node1.getLastKnownReplicationTransactionId());
}
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
index 30dc494..e261cab 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
@@ -177,7 +177,7 @@ public abstract class AbstractUpgradeTestCase extends
UnitTestBase
@Override
public Long call(Database sourceDatabase, Database targetDatabase,
Transaction transaction)
{
-return new Long(sourceDatabase.count());
+return Long.valueOf(sourceDatabase.count());
}
};
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
index 744ea72..3ac34b1 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
@@ -46,8 +46,8 @@ public class MapJsonSerializerTest extends UnitTestBase
{
Map testMap = new HashMap<>();
testMap.put("string", "Test String");
-testMap.put("integer", new Integer(10));
-testMap.put("long", new Long(Long.MAX_VALUE));
+testMap.put("integer", Integer.valueOf(10));
+testMap.put("long", Long.valueOf(Long.MAX_VALUE));
testMap.put("boolean", Boolean.TRUE);
String jsonString = _serializer.serialize(testMap);
diff --git
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
index 1776ea8..91f8b45 100644
---
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
+++
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
@@ -577,7 +577,7 @@ public class MultiNodeTest extends GroupJmsTestBase
LOGGER.info("Active connection port {}",
activeBrokerPort);
[qpid-broker-j] branch main updated: QPID-8537: replace use of constructors marked deprecated-for-removal
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 42abe9f QPID-8537: replace use of constructors marked
deprecated-for-removal
42abe9f is described below
commit 42abe9fdd53e758574ddd68a6c0a88e05c88d214
Author: Robbie Gemmell
AuthorDate: Tue Jun 8 11:22:50 2021 +0100
QPID-8537: replace use of constructors marked deprecated-for-removal
---
.../store/berkeleydb/BDBHAVirtualHostNodeTest.java | 2 +-
.../upgrade/AbstractUpgradeTestCase.java | 2 +-
.../berkeleydb/upgrade/MapJsonSerializerTest.java | 4 +-
.../berkeleydb/replication/MultiNodeTest.java | 6 +-
.../qpid/server/filter/ConstantExpression.java | 2 +-
.../qpid/server/queue/AbstractQueueTestBase.java | 88 +++---
.../org/apache/qpid/server/store/TestRecord.java | 2 +-
.../apache/qpid/server/protocol/v0_8/AMQType.java | 2 +-
.../management/amqp/ManagementInputConverter.java | 12 +--
.../src/main/markdown/code-guide.md| 2 +-
.../qpid/disttest/client/MessageProviderTest.java | 6 +-
.../client/property/ListPropertyValueTest.java | 26 +++
.../client/property/RandomPropertyValueTest.java | 4 +-
.../client/property/RangePropertyValueTest.java| 6 +-
.../client/property/SimplePropertyValueTest.java | 22 +-
.../qpid/disttest/message/JsonHandlerTest.java | 2 +-
16 files changed, 87 insertions(+), 101 deletions(-)
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
index 1609c7c..9e457f5 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
@@ -829,7 +829,7 @@ public class BDBHAVirtualHostNodeTest extends UnitTestBase
Thread.sleep(100l);
}
assertEquals("Last transaction was not replicated",
-new
Long(remote.getLastKnownReplicationTransactionId()),
+
Long.valueOf(remote.getLastKnownReplicationTransactionId()),
node1.getLastKnownReplicationTransactionId());
}
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
index 30dc494..e261cab 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
@@ -177,7 +177,7 @@ public abstract class AbstractUpgradeTestCase extends
UnitTestBase
@Override
public Long call(Database sourceDatabase, Database targetDatabase,
Transaction transaction)
{
-return new Long(sourceDatabase.count());
+return Long.valueOf(sourceDatabase.count());
}
};
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
index 744ea72..3ac34b1 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
@@ -46,8 +46,8 @@ public class MapJsonSerializerTest extends UnitTestBase
{
Map testMap = new HashMap<>();
testMap.put("string", "Test String");
-testMap.put("integer", new Integer(10));
-testMap.put("long", new Long(Long.MAX_VALUE));
+testMap.put("integer", Integer.valueOf(10));
+testMap.put("long", Long.valueOf(Long.MAX_VALUE));
testMap.put("boolean", Boolean.TRUE);
String jsonString = _serializer.serialize(testMap);
diff --git
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
index 1776ea8..91f8b45 100644
---
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
+++
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
@@ -577,7 +577,7 @@ public class MultiNodeTest extends GroupJmsTestBase
LOGGER.info("Active connection port {}",
activeBrokerPort);
List inactivePorts = new ArrayList<>(ports);
-
