Skip to content

Commit 578ee86

Browse files
Revert file AbstractDeclarable.java from main
1 parent c2a7261 commit 578ee86

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

spring-amqp/src/main/java/org/springframework/amqp/core/AbstractDeclarable.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import java.util.concurrent.locks.Lock;
2626
import java.util.concurrent.locks.ReentrantLock;
2727

28+
2829
import org.springframework.lang.Nullable;
2930
import org.springframework.util.Assert;
30-
import org.springframework.util.ObjectUtils;
3131

3232
/**
3333
* Base class for {@link Declarable} classes.
@@ -40,7 +40,7 @@
4040
*/
4141
public abstract class AbstractDeclarable implements Declarable {
4242

43-
private final Lock lock = new ReentrantLock();
43+
private final Lock lock = new ReentrantLock();
4444

4545
private boolean shouldDeclare = true;
4646

@@ -103,18 +103,16 @@ public void setIgnoreDeclarationExceptions(boolean ignoreDeclarationExceptions)
103103

104104
@Override
105105
public void setAdminsThatShouldDeclare(Object... adminArgs) {
106-
this.declaringAdmins = new ArrayList<>();
107-
if (ObjectUtils.isEmpty(adminArgs)) {
108-
return;
109-
}
110-
111-
if (adminArgs.length > 1) {
112-
Assert.noNullElements(adminArgs, "'admins' cannot contain null elements");
113-
this.declaringAdmins.addAll(Arrays.asList(adminArgs));
114-
}
115-
else if (adminArgs[0] != null) {
116-
this.declaringAdmins.add(adminArgs[0]);
106+
Collection<Object> admins = new ArrayList<>();
107+
if (adminArgs != null) {
108+
if (adminArgs.length > 1) {
109+
Assert.noNullElements(adminArgs, "'admins' cannot contain null elements");
110+
}
111+
if (adminArgs.length > 0 && !(adminArgs.length == 1 && adminArgs[0] == null)) {
112+
admins.addAll(Arrays.asList(adminArgs));
113+
}
117114
}
115+
this.declaringAdmins = admins;
118116
}
119117

120118
@Override

0 commit comments

Comments
 (0)