diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-04-01 14:19:21 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-04-01 14:19:21 +0000 |
| commit | 3fac44c98c4c3eb5b88ca93fe6e05278db1ad5a8 (patch) | |
| tree | 20ad185ee8d63bf55102c40ac95b9b228d7f2953 /qpid/java | |
| parent | 43d1adbf18e349a430f7777a862407c51ee2c147 (diff) | |
| download | qpid-python-3fac44c98c4c3eb5b88ca93fe6e05278db1ad5a8.tar.gz | |
QPID-4657, QPID-4683: review changes
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1463142 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java | 7 | ||||
| -rw-r--r-- | qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java index 50bb2e2fcb..d5455bdb25 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java @@ -108,13 +108,12 @@ public class PortFactory boolean useClientAuth = (Boolean) port.getAttribute(Port.NEED_CLIENT_AUTH) || (Boolean) port.getAttribute(Port.WANT_CLIENT_AUTH); if(useClientAuth && broker.getTrustStores().isEmpty()) { - throw new IllegalConfigurationException("Cant create port which requests SSL client certificates as the broker has no trust/peer stores configured."); + throw new IllegalConfigurationException("Can't create port which requests SSL client certificates as the broker has no trust/peer stores configured."); } - boolean doesntUseSSL = port.getTransports().isEmpty() || !port.getTransports().contains(Transport.SSL); - if(useClientAuth && doesntUseSSL) + if(useClientAuth && !port.getTransports().contains(Transport.SSL)) { - throw new IllegalConfigurationException("Cant create port which requests SSL client certificates but doesnt use SSL transport."); + throw new IllegalConfigurationException("Can't create port which requests SSL client certificates but doesnt use SSL transport."); } } else diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java index 5d9cfea709..a9303c264e 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java @@ -151,7 +151,7 @@ public class PortFactoryTest extends QpidTestCase } } - public void testCreateAmqpPortUsingSsslSucceedsWithKeyStore() + public void testCreateAmqpPortUsingSslSucceedsWithKeyStore() { when(_broker.getKeyStores()).thenReturn(Collections.singleton(_keyStore)); |