You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/01/28 17:53:09 UTC
[1/2] qpid-jms git commit: remove unused option
Repository: qpid-jms
Updated Branches:
refs/heads/master f2a975452 -> da9680b20
remove unused option
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/712ae733
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/712ae733
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/712ae733
Branch: refs/heads/master
Commit: 712ae73359de87862e8d93480670456680f1e950
Parents: f2a9754
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Jan 28 16:17:45 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Jan 28 16:17:45 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/jms/JmsConnection.java | 8 --------
.../java/org/apache/qpid/jms/JmsConnectionFactory.java | 9 ---------
.../java/org/apache/qpid/jms/meta/JmsConnectionInfo.java | 10 ----------
.../org/apache/qpid/jms/meta/JmsConnectionInfoTest.java | 2 --
.../org/apache/qpid/jms/JmsConnectionFactoryTest.java | 6 +++---
5 files changed, 3 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/712ae733/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index dd4dbb6..77ce545 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -854,14 +854,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
connectionInfo.setQueuePrefix(queuePrefix);
}
- public boolean isOmitHost() {
- return connectionInfo.isOmitHost();
- }
-
- public void setOmitHost(boolean omitHost) {
- connectionInfo.setOmitHost(omitHost);
- }
-
public JmsPrefetchPolicy getPrefetchPolicy() {
return prefetchPolicy;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/712ae733/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
index 983c586..b44474c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
@@ -58,7 +58,6 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
private boolean forceAsyncSend;
private boolean alwaysSyncSend;
private boolean sendAcksAsync;
- private boolean omitHost;
private boolean localMessagePriority;
private String queuePrefix = null;
private String topicPrefix = null;
@@ -385,14 +384,6 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
this.forceAsyncSend = forceAsyncSend;
}
- public boolean isOmitHost() {
- return omitHost;
- }
-
- public void setOmitHost(boolean omitHost) {
- this.omitHost = omitHost;
- }
-
/**
* @return the localMessagePriority configuration option.
*/
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/712ae733/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
index 93e6537..0f7ec3f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java
@@ -36,7 +36,6 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
private String password;
private boolean forceAsyncSend;
private boolean alwaysSyncSend;
- private boolean omitHost;
public long sendTimeout = DEFAULT_SEND_TIMEOUT;
public long requestTimeout = DEFAULT_REQUEST_TIMEOUT;
public long connectTimeout = DEFAULT_CONNECT_TIMEOUT;
@@ -64,7 +63,6 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
copy.password = password;
copy.forceAsyncSend = forceAsyncSend;
copy.alwaysSyncSend = alwaysSyncSend;
- copy.omitHost = omitHost;
copy.sendTimeout = sendTimeout;
copy.requestTimeout = requestTimeout;
copy.closeTimeout = closeTimeout;
@@ -117,14 +115,6 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne
this.password = password;
}
- public boolean isOmitHost() {
- return omitHost;
- }
-
- public void setOmitHost(boolean omitHost) {
- this.omitHost = omitHost;
- }
-
public String getQueuePrefix() {
return queuePrefix;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/712ae733/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
index 643b28d..8df0949 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
@@ -65,7 +65,6 @@ public class JmsConnectionInfoTest {
info.setCloseTimeout(100);
info.setConnectTimeout(200);
info.setForceAsyncSends(true);
- info.setOmitHost(true);
info.setPassword("pass");
info.setQueuePrefix("queue");
info.setRequestTimeout(50);
@@ -80,7 +79,6 @@ public class JmsConnectionInfoTest {
assertEquals(100, copy.getCloseTimeout());
assertEquals(200, copy.getConnectTimeout());
assertEquals(true, copy.isForceAsyncSend());
- assertEquals(true, copy.isOmitHost());
assertEquals("pass", copy.getPassword());
assertEquals("queue", copy.getQueuePrefix());
assertEquals(50, copy.getRequestTimeout());
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/712ae733/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
index b1dc4da..153867e 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
@@ -99,13 +99,13 @@ public class JmsConnectionFactoryTest extends AmqpTestSupport {
@Test(timeout=60000)
public void testUriOptionsApplied() throws Exception {
- String uri = getGoodProviderAddress() + "?jms.omitHost=true&jms.forceAsyncSend=true";
+ String uri = getGoodProviderAddress() + "?jms.localMessagePriority=true&jms.forceAsyncSend=true";
JmsConnectionFactory factory = new JmsConnectionFactory(uri);
- assertTrue(factory.isOmitHost());
+ assertTrue(factory.isLocalMessagePriority());
assertTrue(factory.isForceAsyncSend());
JmsConnection connection = (JmsConnection) factory.createConnection();
assertNotNull(connection);
- assertTrue(connection.isOmitHost());
+ assertTrue(connection.isLocalMessagePriority());
assertTrue(connection.isForceAsyncSend());
connection.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms git commit: fix c&p error
Posted by ro...@apache.org.
fix c&p error
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/da9680b2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/da9680b2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/da9680b2
Branch: refs/heads/master
Commit: da9680b20985f5b5c1c3b6a24933c1b630e48f88
Parents: 712ae73
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Jan 28 16:52:26 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Jan 28 16:52:26 2015 +0000
----------------------------------------------------------------------
.../org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/da9680b2/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
index 8a9d0da..3326bd4 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
@@ -163,7 +163,7 @@ public class AmqpTransactionContext extends AmqpAbstractResource<JmsSessionInfo,
public void commit(AsyncResult request) throws Exception {
if (current == null) {
- throw new IllegalStateException("Rollback called with no active Transaction.");
+ throw new IllegalStateException("Commit called with no active Transaction.");
}
preCommit();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org