diff options
5 files changed, 7 insertions, 11 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java index 31c4301efc..d567a3aa44 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java @@ -34,7 +34,7 @@ public interface ConfiguredObject /** * Get the universally unique identifier for the object * - * @return the object's id + * @return the objects id */ UUID getId(); @@ -203,14 +203,12 @@ public interface ConfiguredObject /** * Return the value for the given attribute name. The actual attribute value * is returned if the configured object has such attribute set. If not, the - * value is looked in parent hierarchy from bottom to top. If no parent has - * an attribute set than the value is looked in the object default attributes. + * value is looked default attributes. * * @param name * the name of the attribute * @return the value of the attribute at the object (or null if the - * attribute value is set neither on object itself, no object - * parents, no in defaults) + * attribute value is set neither on object itself no in defaults) */ Object getAttribute(String name); @@ -247,7 +245,7 @@ public interface ConfiguredObject /** * Return children of the ConfiguredObject of the given class * - * @param clazz the class of the children to return. + * @param clazz the class of the children to return * @return the children * * @throws NullPointerException if the supplied class null diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java index 920bfc4e56..18affc7161 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java @@ -45,7 +45,7 @@ public class IncomingMessage implements Filterable, InboundMessage, EnqueableMes /** Used for debugging purposes. */ private static final Logger _logger = Logger.getLogger(IncomingMessage.class); - + private final MessagePublishInfo _messagePublishInfo; private ContentHeaderBody _contentHeaderBody; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java index 1ce3c87de6..96078d766c 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java @@ -227,5 +227,4 @@ public class TransactionTimeoutHelperTest extends QpidTestCase } } } - } diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java index 51824463a3..c1ebe26f52 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java @@ -396,7 +396,7 @@ public class BrokerRecovererTest extends TestCase return null; } }; - + return recovever; } }; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java index c427fc4a43..c95f67beb9 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java @@ -33,7 +33,6 @@ import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.configuration.updater.TaskExecutor; -import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.stats.StatisticsGatherer; import org.apache.qpid.server.virtualhost.VirtualHostRegistry; @@ -42,7 +41,7 @@ public class DefaultRecovererProviderTest extends TestCase public void testGetRecoverer() { String[] supportedTypes = {Broker.class.getSimpleName(), - VirtualHost.class.getSimpleName(), AuthenticationProvider.class.getSimpleName(), + VirtualHost.class.getSimpleName(), AuthenticationProvider.class.getSimpleName(), GroupProvider.class.getSimpleName(), Plugin.class.getSimpleName(), Port.class.getSimpleName()}; // mocking the required object |