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/08/24 12:16:22 UTC

qpid-jms git commit: QPIDJMS-92: fix up javadoc to work under Java8, correct a couple typos

Repository: qpid-jms
Updated Branches:
  refs/heads/master 3b416b282 -> 0b2ef1281


QPIDJMS-92: fix up javadoc to work under Java8, correct a couple typos


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/0b2ef128
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0b2ef128
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0b2ef128

Branch: refs/heads/master
Commit: 0b2ef12817c237ae808a4872f8bf88982ad9a0ab
Parents: 3b416b2
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Aug 24 11:15:32 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Aug 24 11:15:32 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/qpid/jms/provider/Provider.java | 8 ++++----
 .../java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0b2ef128/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java
index e2f4f56..0c1f85c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java
@@ -281,11 +281,11 @@ public interface Provider {
      * Request a remote peer send a Message to this client.  A message pull request is
      * usually only needed in the case where the client sets a zero prefetch limit on the
      * consumer.  If the consumer has a set prefetch that's greater than zero this method
-     * should just return without performing and action.
+     * should just return without performing any action.
      *
-     *   timeout < 0 then it should remain open until a message is received.
-     *   timeout = 0 then it returns a message or null if none available
-     *   timeout > 0 then it should remain open for timeout amount of time.
+     *   {@literal timeout < 0} then it should remain open until a message is received.
+     *   {@literal timeout = 0} then it returns a message or null if none available
+     *   {@literal timeout > 0} then it should remain open for timeout amount of time.
      *
      * The timeout value when positive is given in milliseconds.
      *

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0b2ef128/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index ec3a786..91c3233 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -397,9 +397,9 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
     /**
      * Request a remote peer send a Message to this client.
      *
-     *   timeout < 0 then it should remain open until a message is received.
-     *   timeout = 0 then it returns a message or null if none available
-     *   timeout > 0 then it should remain open for timeout amount of time.
+     *   {@literal timeout < 0} then it should remain open until a message is received.
+     *   {@literal timeout = 0} then it returns a message or null if none available
+     *   {@literal timeout > 0} then it should remain open for timeout amount of time.
      *
      * The timeout value when positive is given in milliseconds.
      *
@@ -407,7 +407,7 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
      *        the amount of time to tell the remote peer to keep this pull request valid.
      */
     public void pull(final long timeout) {
-        LOG.trace("Pull called on consumer {} with timouet = {}", getConsumerId(), timeout);
+        LOG.trace("Pull called on consumer {} with timeout = {}", getConsumerId(), timeout);
         if (resource.getPrefetchSize() == 0 && getEndpoint().getCredit() == 0) {
             if (timeout < 0) {
                 getEndpoint().flow(1);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org