You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2007/08/11 02:49:31 UTC
svn commit: r564814 [1/8] - in /activemq/trunk:
activemq-core/src/main/java/org/apache/activemq/
activemq-core/src/main/java/org/apache/activemq/advisory/
activemq-core/src/main/java/org/apache/activemq/broker/
activemq-core/src/main/java/org/apache/ac...
Author: chirino
Date: Fri Aug 10 17:49:19 2007
New Revision: 564814
URL: http://svn.apache.org/viewvc?view=rev&rev=564814
Log:
More checkstyle fixes and Generics usage.
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationFactoryImpl.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMap.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupSet.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/view/ConnectionDotFileInterceptor.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/DiscoveryEvent.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/JournalTransaction.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/DestinationPath.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/PrefixDestinationFilter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/WildcardDestinationFilter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/StoreFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySet.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySet.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollection.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashBin.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreePage.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/JMSConnectionStatsImpl.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/JMSSessionStatsImpl.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/LRUMap.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/MapCache.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageQueue.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/buffer/OrderBasedMessageBuffer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/buffer/SizeBasedMessageBuffer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/list/DestinationBasedMessageList.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/CommandIdComparator.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MarshallerFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationMap.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateSecurityContext.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationMap.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQTopicMessageStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQTx.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicMessageStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicReferenceStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransaction.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubAck.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicSub.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Valve.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/Transport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFilter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransportFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/mock/MockTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastDatagramHeaderMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameTranslator.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/LegacyFrameTranslator.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportServer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpBufferedOutputStream.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/DatagramHeaderMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/DefaultBufferPool.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ByteSequenceData.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayInputStream.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/DataByteArrayOutputStream.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/FactoryFinder.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/HexSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOExceptionSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/JMXSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MapHelper.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AMQDeadlockTest3.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQMessageAuditTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ConnectionCleanupTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicWildcardSendReceiveTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeMessageTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/SpringTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/TestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/Main.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ProgressPrinter.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubBroker.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/CraigsBugTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MessageSender.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/Receiver.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMapMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQObjectMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/demo/DefaultQueueSender.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/demo/SimpleConsumer.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/demo/SimpleProducer.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/jndi/InitialContextTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/memory/buffer/MemoryBufferTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkReconnectTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/InactiveDurableTopicTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/MemoryAllocationTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SecurityTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/StubSecurityContext.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsSendReceiveTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/StubTransport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslSocketHelper.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubSSLSocket.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubX509Certificate.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java
activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Fri Aug 10 17:49:19 2007
@@ -106,7 +106,7 @@
private static final Log LOG = LogFactory.getLog(ActiveMQConnection.class);
private static final IdGenerator CONNECTION_ID_GENERATOR = new IdGenerator();
- public final ConcurrentHashMap activeTempDestinations = new ConcurrentHashMap();
+ public final ConcurrentHashMap<ActiveMQTempDestination, ActiveMQTempDestination> activeTempDestinations = new ConcurrentHashMap<ActiveMQTempDestination, ActiveMQTempDestination>();
protected boolean dispatchAsync;
protected boolean alwaysSessionAsync = true;
@@ -151,14 +151,14 @@
private final AtomicBoolean closing = new AtomicBoolean(false);
private final AtomicBoolean closed = new AtomicBoolean(false);
private final AtomicBoolean transportFailed = new AtomicBoolean(false);
- private final CopyOnWriteArrayList sessions = new CopyOnWriteArrayList();
- private final CopyOnWriteArrayList connectionConsumers = new CopyOnWriteArrayList();
- private final CopyOnWriteArrayList inputStreams = new CopyOnWriteArrayList();
- private final CopyOnWriteArrayList outputStreams = new CopyOnWriteArrayList();
- private final CopyOnWriteArrayList transportListeners = new CopyOnWriteArrayList();
+ private final CopyOnWriteArrayList<ActiveMQSession> sessions = new CopyOnWriteArrayList<ActiveMQSession>();
+ private final CopyOnWriteArrayList<ActiveMQConnectionConsumer> connectionConsumers = new CopyOnWriteArrayList<ActiveMQConnectionConsumer>();
+ private final CopyOnWriteArrayList<ActiveMQInputStream> inputStreams = new CopyOnWriteArrayList<ActiveMQInputStream>();
+ private final CopyOnWriteArrayList<ActiveMQOutputStream> outputStreams = new CopyOnWriteArrayList<ActiveMQOutputStream>();
+ private final CopyOnWriteArrayList<TransportListener> transportListeners = new CopyOnWriteArrayList<TransportListener>();
// Maps ConsumerIds to ActiveMQConsumer objects
- private final ConcurrentHashMap dispatchers = new ConcurrentHashMap();
+ private final ConcurrentHashMap<ConsumerId, ActiveMQDispatcher> dispatchers = new ConcurrentHashMap<ConsumerId, ActiveMQDispatcher>();
private final ConcurrentHashMap<ProducerId, ActiveMQMessageProducer> producers = new ConcurrentHashMap<ProducerId, ActiveMQMessageProducer>();
private final LongSequenceGenerator sessionIdGenerator = new LongSequenceGenerator();
private final SessionId connectionSessionId;
@@ -194,7 +194,7 @@
// Configure a single threaded executor who's core thread can timeout if
// idle
- asyncConnectionThread = new ThreadPoolExecutor(1, 1, 5, TimeUnit.SECONDS, new LinkedBlockingQueue(), new ThreadFactory() {
+ asyncConnectionThread = new ThreadPoolExecutor(1, 1, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
public Thread newThread(Runnable r) {
Thread thread = new Thread(r, "AcitveMQ Connection Worker: " + transport);
thread.setDaemon(true);
@@ -290,7 +290,6 @@
public Session createSession(boolean transacted, int acknowledgeMode) throws JMSException {
checkClosedOrFailed();
ensureConnectionInfoSent();
- boolean doSessionAsync = alwaysSessionAsync || sessions.size() > 0 || transacted || acknowledgeMode == Session.CLIENT_ACKNOWLEDGE;
return new ActiveMQSession(this, getNextSessionId(), transacted ? Session.SESSION_TRANSACTED : (acknowledgeMode == Session.SESSION_TRANSACTED
? Session.AUTO_ACKNOWLEDGE : acknowledgeMode), dispatchAsync, alwaysSessionAsync);
}
@@ -453,8 +452,8 @@
checkClosedOrFailed();
ensureConnectionInfoSent();
if (started.compareAndSet(false, true)) {
- for (Iterator i = sessions.iterator(); i.hasNext();) {
- ActiveMQSession session = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = sessions.iterator(); i.hasNext();) {
+ ActiveMQSession session = i.next();
session.start();
}
}
@@ -494,8 +493,8 @@
public void stop() throws JMSException {
checkClosedOrFailed();
if (started.compareAndSet(true, false)) {
- for (Iterator i = sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
s.stop();
}
}
@@ -560,20 +559,20 @@
advisoryConsumer = null;
}
- for (Iterator i = this.sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = this.sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
s.dispose();
}
- for (Iterator i = this.connectionConsumers.iterator(); i.hasNext();) {
- ActiveMQConnectionConsumer c = (ActiveMQConnectionConsumer)i.next();
+ for (Iterator<ActiveMQConnectionConsumer> i = this.connectionConsumers.iterator(); i.hasNext();) {
+ ActiveMQConnectionConsumer c = i.next();
c.dispose();
}
- for (Iterator i = this.inputStreams.iterator(); i.hasNext();) {
- ActiveMQInputStream c = (ActiveMQInputStream)i.next();
+ for (Iterator<ActiveMQInputStream> i = this.inputStreams.iterator(); i.hasNext();) {
+ ActiveMQInputStream c = i.next();
c.dispose();
}
- for (Iterator i = this.outputStreams.iterator(); i.hasNext();) {
- ActiveMQOutputStream c = (ActiveMQOutputStream)i.next();
+ for (Iterator<ActiveMQOutputStream> i = this.outputStreams.iterator(); i.hasNext();) {
+ ActiveMQOutputStream c = i.next();
c.dispose();
}
@@ -691,7 +690,7 @@
// Allows the options on the destination to configure the consumerInfo
if (info.getDestination().getOptions() != null) {
- HashMap options = new HashMap(info.getDestination().getOptions());
+ Map<String, String> options = new HashMap<String, String>(info.getDestination().getOptions());
IntrospectionSupport.setProperties(this.info, options, "consumer.");
}
@@ -1076,7 +1075,7 @@
// Allows the options on the destination to configure the consumerInfo
if (info.getDestination().getOptions() != null) {
- HashMap options = new HashMap(info.getDestination().getOptions());
+ Map<String, String> options = new HashMap<String, String>(info.getDestination().getOptions());
IntrospectionSupport.setProperties(info, options, "consumer.");
}
@@ -1324,20 +1323,20 @@
advisoryConsumer = null;
}
- for (Iterator i = this.sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = this.sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
s.dispose();
}
- for (Iterator i = this.connectionConsumers.iterator(); i.hasNext();) {
- ActiveMQConnectionConsumer c = (ActiveMQConnectionConsumer)i.next();
+ for (Iterator<ActiveMQConnectionConsumer> i = this.connectionConsumers.iterator(); i.hasNext();) {
+ ActiveMQConnectionConsumer c = i.next();
c.dispose();
}
- for (Iterator i = this.inputStreams.iterator(); i.hasNext();) {
- ActiveMQInputStream c = (ActiveMQInputStream)i.next();
+ for (Iterator<ActiveMQInputStream> i = this.inputStreams.iterator(); i.hasNext();) {
+ ActiveMQInputStream c = i.next();
c.dispose();
}
- for (Iterator i = this.outputStreams.iterator(); i.hasNext();) {
- ActiveMQOutputStream c = (ActiveMQOutputStream)i.next();
+ for (Iterator<ActiveMQOutputStream> i = this.outputStreams.iterator(); i.hasNext();) {
+ ActiveMQOutputStream c = i.next();
c.dispose();
}
@@ -1537,7 +1536,7 @@
command.visit(new CommandVisitorAdapter() {
@Override
public Response processMessageDispatch(MessageDispatch md) throws Exception {
- ActiveMQDispatcher dispatcher = (ActiveMQDispatcher)dispatchers.get(md.getConsumerId());
+ ActiveMQDispatcher dispatcher = dispatchers.get(md.getConsumerId());
if (dispatcher != null) {
// Copy in case a embedded broker is dispatching via
// vm://
@@ -1616,8 +1615,8 @@
}
}
- for (Iterator iter = transportListeners.iterator(); iter.hasNext();) {
- TransportListener listener = (TransportListener)iter.next();
+ for (Iterator<TransportListener> iter = transportListeners.iterator(); iter.hasNext();) {
+ TransportListener listener = iter.next();
listener.onCommand(command);
}
}
@@ -1660,8 +1659,8 @@
ServiceSupport.dispose(ActiveMQConnection.this.transport);
brokerInfoReceived.countDown();
- for (Iterator iter = transportListeners.iterator(); iter.hasNext();) {
- TransportListener listener = (TransportListener)iter.next();
+ for (Iterator<TransportListener> iter = transportListeners.iterator(); iter.hasNext();) {
+ TransportListener listener = iter.next();
listener.onException(error);
}
}
@@ -1669,23 +1668,23 @@
}
public void transportInterupted() {
- for (Iterator i = this.sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = this.sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
s.clearMessagesInProgress();
}
- for (Iterator iter = transportListeners.iterator(); iter.hasNext();) {
- TransportListener listener = (TransportListener)iter.next();
+ for (Iterator<TransportListener> iter = transportListeners.iterator(); iter.hasNext();) {
+ TransportListener listener = iter.next();
listener.transportInterupted();
}
}
public void transportResumed() {
- for (Iterator iter = transportListeners.iterator(); iter.hasNext();) {
- TransportListener listener = (TransportListener)iter.next();
+ for (Iterator<TransportListener> iter = transportListeners.iterator(); iter.hasNext();) {
+ TransportListener listener = iter.next();
listener.transportResumed();
}
- for (Iterator i = this.sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = this.sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
s.deliverAcks();
}
}
@@ -1726,8 +1725,8 @@
checkClosedOrFailed();
- for (Iterator i = this.sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = this.sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
if (s.isInUse(destination)) {
throw new JMSException("A consumer is consuming from the temporary destination");
}
@@ -1881,7 +1880,7 @@
* {@link javax.jms.Message#setObjectProperty(String, Object)}
* method
*/
- public OutputStream createOutputStream(Destination dest, Map streamProperties, int deliveryMode, int priority, long timeToLive) throws JMSException {
+ public OutputStream createOutputStream(Destination dest, Map<String, Object> streamProperties, int deliveryMode, int priority, long timeToLive) throws JMSException {
checkClosedOrFailed();
ensureConnectionInfoSent();
return new ActiveMQOutputStream(this, createProducerId(), ActiveMQDestination.transform(dest), streamProperties, deliveryMode, priority, timeToLive);
@@ -1910,7 +1909,7 @@
checkClosedOrFailed();
RemoveSubscriptionInfo rsi = new RemoveSubscriptionInfo();
rsi.setConnectionId(getConnectionInfo().getConnectionId());
- rsi.setSubcriptionName(name);
+ rsi.setSubscriptionName(name);
rsi.setClientId(getConnectionInfo().getClientId());
syncSendPacket(rsi);
}
@@ -1990,8 +1989,8 @@
protected void onConnectionControl(ConnectionControl command) {
if (command.isFaultTolerant()) {
this.optimizeAcknowledge = false;
- for (Iterator i = this.sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = this.sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
s.setOptimizeAcknowledge(false);
}
}
@@ -1999,13 +1998,13 @@
protected void onConsumerControl(ConsumerControl command) {
if (command.isClose()) {
- for (Iterator i = this.sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = this.sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
s.close(command.getConsumerId());
}
} else {
- for (Iterator i = this.sessions.iterator(); i.hasNext();) {
- ActiveMQSession s = (ActiveMQSession)i.next();
+ for (Iterator<ActiveMQSession> i = this.sessions.iterator(); i.hasNext();) {
+ ActiveMQSession s = i.next();
s.setPrefetchSize(command.getConsumerId(), command.getPrefetch());
}
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java Fri Aug 10 17:49:19 2007
@@ -18,6 +18,7 @@
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;
@@ -550,10 +551,11 @@
setBrokerURL(temp);
}
- buildFromMap(properties);
+ Map<String, Object> p = new HashMap(properties);
+ buildFromMap(p);
}
- public boolean buildFromMap(Map properties) {
+ public boolean buildFromMap(Map<String, Object> properties) {
boolean rc = false;
ActiveMQPrefetchPolicy p = new ActiveMQPrefetchPolicy();
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java Fri Aug 10 17:49:19 2007
@@ -17,7 +17,7 @@
package org.apache.activemq;
import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Vector;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -137,12 +137,12 @@
* @return an Enumeration of JMSX property names
*/
- public Enumeration getJMSXPropertyNames() {
- Hashtable jmxProperties = new Hashtable();
- jmxProperties.put("JMSXGroupID", "1");
- jmxProperties.put("JMSXGroupSeq", "1");
- jmxProperties.put("JMSXDeliveryCount", "1");
- jmxProperties.put("JMSXProducerTXID", "1");
- return jmxProperties.keys();
+ public Enumeration<String> getJMSXPropertyNames() {
+ Vector<String> jmxProperties = new Vector<String>();
+ jmxProperties.add("JMSXGroupID");
+ jmxProperties.add("JMSXGroupSeq");
+ jmxProperties.add("JMSXDeliveryCount");
+ jmxProperties.add("JMSXProducerTXID");
+ return jmxProperties.elements();
}
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Fri Aug 10 17:49:19 2007
@@ -138,8 +138,10 @@
* @param dispatchAsync
* @throws JMSException
*/
- public ActiveMQMessageConsumer(ActiveMQSession session, ConsumerId consumerId, ActiveMQDestination dest, String name, String selector, int prefetch,
- int maximumPendingMessageCount, boolean noLocal, boolean browser, boolean dispatchAsync) throws JMSException {
+ public ActiveMQMessageConsumer(ActiveMQSession session, ConsumerId consumerId, ActiveMQDestination dest,
+ String name, String selector, int prefetch,
+ int maximumPendingMessageCount, boolean noLocal, boolean browser,
+ boolean dispatchAsync) throws JMSException {
if (dest == null) {
throw new InvalidDestinationException("Don't understand null destinations");
} else if (dest.getPhysicalName() == null) {
@@ -154,11 +156,13 @@
String connectionID = session.connection.getConnectionInfo().getConnectionId().getValue();
if (physicalName.indexOf(connectionID) < 0) {
- throw new InvalidDestinationException("Cannot use a Temporary destination from another Connection");
+ throw new InvalidDestinationException(
+ "Cannot use a Temporary destination from another Connection");
}
if (session.connection.isDeleted(dest)) {
- throw new InvalidDestinationException("Cannot use a Temporary destination that has been deleted");
+ throw new InvalidDestinationException(
+ "Cannot use a Temporary destination that has been deleted");
}
}
@@ -199,7 +203,8 @@
}
this.stats = new JMSConsumerStatsImpl(session.getSessionStats(), dest);
- this.optimizeAcknowledge = session.connection.isOptimizeAcknowledge() && session.isAutoAcknowledge() && !info.isBrowser();
+ this.optimizeAcknowledge = session.connection.isOptimizeAcknowledge() && session.isAutoAcknowledge()
+ && !info.isBrowser();
this.info.setOptimizedAcknowledge(this.optimizeAcknowledge);
try {
this.session.addConsumer(this);
@@ -342,7 +347,8 @@
public void setMessageListener(MessageListener listener) throws JMSException {
checkClosed();
if (info.getPrefetchSize() == 0) {
- throw new JMSException("Illegal prefetch size of zero. This setting is not supported for asynchronous consumers please set a value of at least 1");
+ throw new JMSException(
+ "Illegal prefetch size of zero. This setting is not supported for asynchronous consumers please set a value of at least 1");
}
this.messageListener = listener;
if (listener != null) {
@@ -709,15 +715,16 @@
ackLater(md, MessageAck.DELIVERED_ACK_TYPE);
} else {
stats.onMessage();
- if( session.isTransacted() ) {
+ if (session.isTransacted()) {
// Do nothing.
- } else if(session.isAutoAcknowledge()) {
+ } else if (session.isAutoAcknowledge()) {
if (!deliveredMessages.isEmpty()) {
if (optimizeAcknowledge) {
if (deliveryingAcknowledgements.compareAndSet(false, true)) {
ackCounter++;
if (ackCounter >= (info.getCurrentPrefetchSize() * .65)) {
- MessageAck ack = new MessageAck(md, MessageAck.STANDARD_ACK_TYPE, deliveredMessages.size());
+ MessageAck ack = new MessageAck(md, MessageAck.STANDARD_ACK_TYPE,
+ deliveredMessages.size());
session.asyncSendPacket(ack);
ackCounter = 0;
deliveredMessages.clear();
@@ -725,7 +732,8 @@
deliveryingAcknowledgements.set(false);
}
} else {
- MessageAck ack = new MessageAck(md, MessageAck.STANDARD_ACK_TYPE, deliveredMessages.size());
+ MessageAck ack = new MessageAck(md, MessageAck.STANDARD_ACK_TYPE, deliveredMessages
+ .size());
session.asyncSendPacket(ack);
deliveredMessages.clear();
}
@@ -835,14 +843,15 @@
}
if (deliveredMessages.isEmpty()) {
return;
- }
+ }
// Only increase the redlivery delay after the first redelivery..
if (rollbackCounter > 0) {
redeliveryDelay = redeliveryPolicy.getRedeliveryDelay(redeliveryDelay);
}
rollbackCounter++;
- if (redeliveryPolicy.getMaximumRedeliveries() != RedeliveryPolicy.NO_MAXIMUM_REDELIVERIES && rollbackCounter > redeliveryPolicy.getMaximumRedeliveries()) {
+ if (redeliveryPolicy.getMaximumRedeliveries() != RedeliveryPolicy.NO_MAXIMUM_REDELIVERIES
+ && rollbackCounter > redeliveryPolicy.getMaximumRedeliveries()) {
// We need to NACK the messages so that they get sent to the
// DLQ.
// Acknowledge the last message.
@@ -971,7 +980,8 @@
}
public String toString() {
- return "ActiveMQMessageConsumer { value=" + info.getConsumerId() + ", started=" + started.get() + " }";
+ return "ActiveMQMessageConsumer { value=" + info.getConsumerId() + ", started=" + started.get()
+ + " }";
}
/**
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java Fri Aug 10 17:49:19 2007
@@ -50,8 +50,11 @@
*
* @version $Revision: 1.1 $
*/
-public class ActiveMQMessageTransformation {
+public final class ActiveMQMessageTransformation {
+ private ActiveMQMessageTransformation() {
+ }
+
/**
* Creates a an available JMS message from another provider.
*
@@ -95,7 +98,7 @@
* message.
* @throws JMSException if an error occurs
*/
- public static final ActiveMQMessage transformMessage(Message message, ActiveMQConnection connection)
+ public static ActiveMQMessage transformMessage(Message message, ActiveMQConnection connection)
throws JMSException {
if (message instanceof ActiveMQMessage) {
return (ActiveMQMessage)message;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java Fri Aug 10 17:49:19 2007
@@ -20,6 +20,7 @@
import org.apache.activemq.advisory.AdvisorySupport;
import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQTempDestination;
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.DataStructure;
@@ -79,17 +80,24 @@
if (o != null && o.getClass() == DestinationInfo.class) {
processDestinationInfo((DestinationInfo)o);
} else {
- connection.onAsyncException(new JMSException("Unexpected message was dispatched to the AdvisoryConsumer: " + md));
+ connection.onAsyncException(new JMSException(
+ "Unexpected message was dispatched to the AdvisoryConsumer: "
+ + md));
}
}
private void processDestinationInfo(DestinationInfo dinfo) {
ActiveMQDestination dest = dinfo.getDestination();
+ if (!dest.isTemporary()) {
+ return;
+ }
+
+ ActiveMQTempDestination tempDest = (ActiveMQTempDestination)dest;
if (dinfo.getOperationType() == DestinationInfo.ADD_OPERATION_TYPE) {
- connection.activeTempDestinations.put(dest, dest);
+ connection.activeTempDestinations.put(tempDest, tempDest);
} else if (dinfo.getOperationType() == DestinationInfo.REMOVE_OPERATION_TYPE) {
- connection.activeTempDestinations.remove(dest);
+ connection.activeTempDestinations.remove(tempDest);
}
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java Fri Aug 10 17:49:19 2007
@@ -50,7 +50,7 @@
OutputStream createOutputStream(Destination dest) throws JMSException;
- OutputStream createOutputStream(Destination dest, Map streamProperties, int deliveryMode, int priority, long timeToLive) throws JMSException;
+ OutputStream createOutputStream(Destination dest, Map<String, Object> streamProperties, int deliveryMode, int priority, long timeToLive) throws JMSException;
/**
* Unsubscribes a durable subscription that has been created by a client.
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java Fri Aug 10 17:49:19 2007
@@ -30,6 +30,7 @@
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConnectionId;
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
@@ -53,10 +54,10 @@
private static final Log LOG = LogFactory.getLog(AdvisoryBroker.class);
private static final IdGenerator ID_GENERATOR = new IdGenerator();
- protected final ConcurrentHashMap connections = new ConcurrentHashMap();
- protected final ConcurrentHashMap consumers = new ConcurrentHashMap();
- protected final ConcurrentHashMap producers = new ConcurrentHashMap();
- protected final ConcurrentHashMap destinations = new ConcurrentHashMap();
+ protected final ConcurrentHashMap<ConnectionId, ConnectionInfo> connections = new ConcurrentHashMap<ConnectionId, ConnectionInfo>();
+ protected final ConcurrentHashMap<ConsumerId, ConsumerInfo> consumers = new ConcurrentHashMap<ConsumerId, ConsumerInfo>();
+ protected final ConcurrentHashMap<ProducerId, ProducerInfo> producers = new ConcurrentHashMap<ProducerId, ProducerInfo>();
+ protected final ConcurrentHashMap<ActiveMQDestination, DestinationInfo> destinations = new ConcurrentHashMap<ActiveMQDestination, DestinationInfo>();
protected final ProducerId advisoryProducerId = new ProducerId();
private final LongSequenceGenerator messageIdGenerator = new LongSequenceGenerator();
@@ -88,8 +89,8 @@
// for this newly added consumer.
if (AdvisorySupport.isConnectionAdvisoryTopic(info.getDestination())) {
// Replay the connections.
- for (Iterator iter = connections.values().iterator(); iter.hasNext();) {
- ConnectionInfo value = (ConnectionInfo)iter.next();
+ for (Iterator<ConnectionInfo> iter = connections.values().iterator(); iter.hasNext();) {
+ ConnectionInfo value = iter.next();
ActiveMQTopic topic = AdvisorySupport.getConnectionAdvisoryTopic();
fireAdvisory(context, topic, value, info.getConsumerId());
}
@@ -100,8 +101,8 @@
// for this newly added consumer.
if (AdvisorySupport.isDestinationAdvisoryTopic(info.getDestination())) {
// Replay the destinations.
- for (Iterator iter = destinations.values().iterator(); iter.hasNext();) {
- DestinationInfo value = (DestinationInfo)iter.next();
+ for (Iterator<DestinationInfo> iter = destinations.values().iterator(); iter.hasNext();) {
+ DestinationInfo value = iter.next();
ActiveMQTopic topic = AdvisorySupport.getDestinationAdvisoryTopic(value.getDestination());
fireAdvisory(context, topic, value, info.getConsumerId());
}
@@ -109,8 +110,8 @@
// Replay the producers.
if (AdvisorySupport.isProducerAdvisoryTopic(info.getDestination())) {
- for (Iterator iter = producers.values().iterator(); iter.hasNext();) {
- ProducerInfo value = (ProducerInfo)iter.next();
+ for (Iterator<ProducerInfo> iter = producers.values().iterator(); iter.hasNext();) {
+ ProducerInfo value = iter.next();
ActiveMQTopic topic = AdvisorySupport.getProducerAdvisoryTopic(value.getDestination());
fireProducerAdvisory(context, topic, value, info.getConsumerId());
}
@@ -118,8 +119,8 @@
// Replay the consumers.
if (AdvisorySupport.isConsumerAdvisoryTopic(info.getDestination())) {
- for (Iterator iter = consumers.values().iterator(); iter.hasNext();) {
- ConsumerInfo value = (ConsumerInfo)iter.next();
+ for (Iterator<ConsumerInfo> iter = consumers.values().iterator(); iter.hasNext();) {
+ ConsumerInfo value = iter.next();
ActiveMQTopic topic = AdvisorySupport.getConsumerAdvisoryTopic(value.getDestination());
fireConsumerAdvisory(context, topic, value, info.getConsumerId());
}
@@ -163,7 +164,7 @@
public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
next.removeDestination(context, destination, timeout);
- DestinationInfo info = (DestinationInfo)destinations.remove(destination);
+ DestinationInfo info = destinations.remove(destination);
if (info != null) {
info.setDestination(destination);
info.setOperationType(DestinationInfo.REMOVE_OPERATION_TYPE);
@@ -183,7 +184,7 @@
public void removeDestinationInfo(ConnectionContext context, DestinationInfo destInfo) throws Exception {
next.removeDestinationInfo(context, destInfo);
- DestinationInfo info = (DestinationInfo)destinations.remove(destInfo.getDestination());
+ DestinationInfo info = destinations.remove(destInfo.getDestination());
if (info != null) {
info.setDestination(destInfo.getDestination());
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java Fri Aug 10 17:49:19 2007
@@ -21,7 +21,7 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQTopic;
-public class AdvisorySupport {
+public final class AdvisorySupport {
public static final String ADVISORY_TOPIC_PREFIX = "ActiveMQ.Advisory.";
public static final ActiveMQTopic CONNECTION_ADVISORY_TOPIC = new ActiveMQTopic(ADVISORY_TOPIC_PREFIX + "Connection");
@@ -45,6 +45,9 @@
public static final ActiveMQTopic TEMP_DESTINATION_COMPOSITE_ADVISORY_TOPIC = new ActiveMQTopic(TEMP_QUEUE_ADVISORY_TOPIC + "," + TEMP_TOPIC_ADVISORY_TOPIC);
private static final ActiveMQTopic AGENT_TOPIC_DESTINATION = new ActiveMQTopic(AGENT_TOPIC);
+ private AdvisorySupport() {
+ }
+
public static ActiveMQTopic getConnectionAdvisoryTopic() {
return CONNECTION_ADVISORY_TOPIC;
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java Fri Aug 10 17:49:19 2007
@@ -228,19 +228,19 @@
}
public synchronized void addListener(Broker broker) {
- List tmp = getListenersAsList();
+ List<Broker> tmp = getListenersAsList();
tmp.add(broker);
- listeners = (Broker[])tmp.toArray(new Broker[tmp.size()]);
+ listeners = tmp.toArray(new Broker[tmp.size()]);
}
public synchronized void removeListener(Broker broker) {
- List tmp = getListenersAsList();
+ List<Broker> tmp = getListenersAsList();
tmp.remove(broker);
- listeners = (Broker[])tmp.toArray(new Broker[tmp.size()]);
+ listeners = tmp.toArray(new Broker[tmp.size()]);
}
- protected List getListenersAsList() {
- List tmp = new ArrayList();
+ protected List<Broker> getListenersAsList() {
+ List<Broker> tmp = new ArrayList<Broker>();
Broker brokers[] = getListeners();
for (int i = 0; i < brokers.length; i++) {
tmp.add(brokers[i]);
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java Fri Aug 10 17:49:19 2007
@@ -29,10 +29,13 @@
*
* @version $Revision$
*/
-public class BrokerFactory {
+public final class BrokerFactory {
private static final FactoryFinder BROKER_FACTORY_HANDLER_FINDER = new FactoryFinder("META-INF/services/org/apache/activemq/broker/");
+ private BrokerFactory() {
+ }
+
public static BrokerFactoryHandler createBrokerFactoryHandler(String type) throws IOException {
try {
return (BrokerFactoryHandler)BROKER_FACTORY_HANDLER_FINDER.newInstance(type);
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java Fri Aug 10 17:49:19 2007
@@ -61,7 +61,7 @@
return next.getAdaptor(type);
}
- public Map getDestinationMap() {
+ public Map<ActiveMQDestination, Destination> getDestinationMap() {
return next.getDestinationMap();
}
@@ -205,7 +205,7 @@
return next.isStopped();
}
- public Set getDurableDestinations() {
+ public Set<ActiveMQDestination> getDurableDestinations() {
return next.getDurableDestinations();
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java Fri Aug 10 17:49:19 2007
@@ -18,6 +18,8 @@
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,7 +32,7 @@
private static final BrokerRegistry INSTANCE = new BrokerRegistry();
private final Object mutex = new Object();
- private final HashMap<String, BrokerService> brokers = new HashMap<String, BrokerService>();
+ private final Map<String, BrokerService> brokers = new HashMap<String, BrokerService>();
public static BrokerRegistry getInstance() {
return INSTANCE;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java Fri Aug 10 17:49:19 2007
@@ -63,7 +63,8 @@
return null;
}
- public Map getDestinationMap() {
+ @SuppressWarnings("unchecked")
+ public Map<ActiveMQDestination, Destination> getDestinationMap() {
return Collections.EMPTY_MAP;
}
@@ -198,7 +199,7 @@
return false;
}
- public Set getDurableDestinations() {
+ public Set<ActiveMQDestination> getDurableDestinations() {
return null;
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java Fri Aug 10 17:49:19 2007
@@ -55,7 +55,8 @@
this.message = message;
}
- public Map getDestinationMap() {
+ @SuppressWarnings("unchecked")
+ public Map<ActiveMQDestination, Destination> getDestinationMap() {
return Collections.EMPTY_MAP;
}
@@ -203,7 +204,7 @@
return true;
}
- public Set getDurableDestinations() {
+ public Set<ActiveMQDestination> getDurableDestinations() {
throw new BrokerStoppedException(this.message);
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java?view=diff&rev=564814&r1=564813&r2=564814
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java Fri Aug 10 17:49:19 2007
@@ -75,7 +75,7 @@
}
}
- public Map getDestinationMap() {
+ public Map<ActiveMQDestination, Destination> getDestinationMap() {
return getNext().getDestinationMap();
}
@@ -215,7 +215,7 @@
return getNext().isStopped();
}
- public Set getDurableDestinations() {
+ public Set<ActiveMQDestination> getDurableDestinations() {
return getNext().getDurableDestinations();
}