You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/08/19 22:07:49 UTC
svn commit: r1618964 - in /qpid/trunk/qpid/java:
amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/
amqp-1-0-common...
Author: rgodfrey
Date: Tue Aug 19 20:07:48 2014
New Revision: 1618964
URL: http://svn.apache.org/r1618964
Log:
QPID-6022 : [Java] Fix issues highlighted by code scanning tools
Modified:
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified: qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java Tue Aug 19 20:07:48 2014
@@ -448,9 +448,9 @@ public class Sender implements DeliveryS
public void handle(Binary deliveryTag, DeliveryState state, Boolean settled)
{
+ OutcomeAction action;
if(state instanceof Outcome)
{
- OutcomeAction action;
if((action = _outcomeActions.remove(deliveryTag)) != null)
{
@@ -464,7 +464,6 @@ public class Sender implements DeliveryS
}
else if(state instanceof TransactionalState)
{
- OutcomeAction action;
if((action = _outcomeActions.remove(deliveryTag)) != null)
{
final Outcome outcome = ((TransactionalState) state).getOutcome();
@@ -472,6 +471,10 @@ public class Sender implements DeliveryS
}
}
+ else if(state == null && settled && (action = _outcomeActions.remove(deliveryTag)) != null)
+ {
+ action.onOutcome(deliveryTag, _defaultOutcome);
+ }
}
public SendingLinkEndpoint getEndpoint()
Modified: qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java Tue Aug 19 20:07:48 2014
@@ -318,22 +318,7 @@ public class ConnectionHandler
{
_writer.setValue(frame);
- try
- {
_writer.writeToBuffer(_buffer);
- }
- catch(RuntimeException e)
- {
- e.printStackTrace();
- throw e;
- }
- catch(Error e)
- {
- e.printStackTrace();
- throw e;
- }
-
-
}
else
{
Modified: qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java Tue Aug 19 20:07:48 2014
@@ -23,8 +23,6 @@ package org.apache.qpid.amqp_1_0.type;
import java.nio.ByteBuffer;
import java.util.Collection;
-import static java.lang.Math.min;
-
public class Binary
{
@@ -64,32 +62,32 @@ public class Binary
public final boolean equals(Object o)
{
- Binary buf = (Binary) o;
- if(o == null)
- {
- return false;
- }
- final int size = _length;
- if (size != buf._length)
+ if(o instanceof Binary)
{
- return false;
- }
+ Binary buf = (Binary) o;
- final byte[] myData = _data;
- final byte[] theirData = buf._data;
- int myOffset = _offset;
- int theirOffset = buf._offset;
- final int myLimit = myOffset + size;
-
- while(myOffset < myLimit)
- {
- if (myData[myOffset++] != theirData[theirOffset++])
+ final int size = _length;
+ if (size == buf._length)
{
- return false;
+ final byte[] myData = _data;
+ final byte[] theirData = buf._data;
+ int myOffset = _offset;
+ int theirOffset = buf._offset;
+ final int myLimit = myOffset + size;
+
+ while (myOffset < myLimit)
+ {
+ if (myData[myOffset++] != theirData[theirOffset++])
+ {
+ return false;
+ }
+ }
+
+ return true;
}
}
- return true;
+ return false;
}
Modified: qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java Tue Aug 19 20:07:48 2014
@@ -58,7 +58,7 @@ public class SaslMechanisms
{
builder.append(',');
}
- builder.append("saslServerMechanisms=").append(_saslServerMechanisms == null ? "" : Arrays.asList(_saslServerMechanisms));
+ builder.append("saslServerMechanisms=").append(Arrays.asList(_saslServerMechanisms));
}
builder.append('}');
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java Tue Aug 19 20:07:48 2014
@@ -137,15 +137,6 @@ public class ConfiguredObjectFactoryImpl
else
{
factory = getConfiguredObjectTypeFactory(category, null);
- if(factory == null)
- {
- ManagedObject annotation = categoryClass.getAnnotation(ManagedObject.class);
- factory = getConfiguredObjectTypeFactory(category, annotation.defaultType());
- if(factory == null)
- {
- throw new NoFactoryForTypeException(category, annotation.defaultType());
- }
- }
}
return factory;
}
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java Tue Aug 19 20:07:48 2014
@@ -61,10 +61,10 @@ class InetNetwork
@Override
public boolean equals(Object obj)
{
- return (obj != null) &&
- (obj instanceof InetNetwork) &&
- ((InetNetwork)obj).network.equals(network) &&
- ((InetNetwork)obj).netmask.equals(netmask);
+ return (obj != null) &&
+ (obj instanceof InetNetwork) &&
+ ((InetNetwork) obj).network.equals(network) &&
+ ((InetNetwork) obj).netmask.equals(netmask);
}
public static InetNetwork getFromString(String netspec) throws java.net.UnknownHostException
@@ -95,15 +95,13 @@ class InetNetwork
{
try
{
- return getByAddress(
- new byte[]
- {
- (byte) (mask[0] & ip[0]),
- (byte) (mask[1] & ip[1]),
- (byte) (mask[2] & ip[2]),
- (byte) (mask[3] & ip[3])
- }
- );
+ return InetAddress.getByAddress(new byte[]
+ {
+ (byte) (mask[0] & ip[0]),
+ (byte) (mask[1] & ip[1]),
+ (byte) (mask[2] & ip[2]),
+ (byte) (mask[3] & ip[3])
+ });
}
catch (Exception _)
{
@@ -127,7 +125,7 @@ class InetNetwork
*/
static private String normalizeFromAsterisk(final String netspec)
{
- String[] masks = { "0.0.0.0/0.0.0.0", "0.0.0/255.0.0.0", "0.0/255.255.0.0", "0/255.255.255.0" };
+ String[] masks = {"0.0.0.0/0.0.0.0", "0.0.0/255.0.0.0", "0.0/255.255.0.0", "0/255.255.255.0"};
char[] srcb = netspec.toCharArray();
int octets = 0;
for (int i = 1; i < netspec.length(); i++)
@@ -137,7 +135,7 @@ class InetNetwork
octets++;
}
}
- return (octets == 0) ? masks[0] : netspec.substring(0, netspec.length() -1 ).concat(masks[octets]);
+ return (octets == 0) ? masks[0] : netspec.substring(0, netspec.length() - 1).concat(masks[octets]);
}
/*
@@ -148,30 +146,14 @@ class InetNetwork
*/
static private String normalizeFromCIDR(final String netspec)
{
- final int bits = 32 - Integer.parseInt(netspec.substring(netspec.indexOf('/')+1));
- final int mask = (bits == 32) ? 0 : 0xFFFFFFFF - ((1 << bits)-1);
+ final int bits = 32 - Integer.parseInt(netspec.substring(netspec.indexOf('/') + 1));
+ final int mask = (bits == 32) ? 0 : 0xFFFFFFFF - ((1 << bits) - 1);
return netspec.substring(0, netspec.indexOf('/') + 1) +
- Integer.toString(mask >> 24 & 0xFF, 10) + "." +
- Integer.toString(mask >> 16 & 0xFF, 10) + "." +
- Integer.toString(mask >> 8 & 0xFF, 10) + "." +
- Integer.toString(mask >> 0 & 0xFF, 10);
- }
-
- private static InetAddress getByAddress(byte[] ip) throws java.net.UnknownHostException
- {
- InetAddress addr = InetAddress.getByAddress(ip);
-
- if (addr == null) {
- addr = InetAddress.getByName
- (
- Integer.toString(ip[0] & 0xFF, 10) + "." +
- Integer.toString(ip[1] & 0xFF, 10) + "." +
- Integer.toString(ip[2] & 0xFF, 10) + "." +
- Integer.toString(ip[3] & 0xFF, 10)
- );
- }
-
- return addr;
+ Integer.toString(mask >> 24 & 0xFF, 10) + "." +
+ Integer.toString(mask >> 16 & 0xFF, 10) + "." +
+ Integer.toString(mask >> 8 & 0xFF, 10) + "." +
+ Integer.toString(mask >> 0 & 0xFF, 10);
}
-}
\ No newline at end of file
+
+}
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Tue Aug 19 20:07:48 2014
@@ -628,7 +628,7 @@ public class SendingLink_1_0 implements
queueEntry.release();
_unsettledMap.remove(deliveryTag);
}
- else if(initialUnsettledMap != null && (initialUnsettledMap.get(deliveryTag) instanceof Outcome))
+ else if(initialUnsettledMap.get(deliveryTag) instanceof Outcome)
{
Outcome outcome = (Outcome) initialUnsettledMap.get(deliveryTag);
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Tue Aug 19 20:07:48 2014
@@ -146,7 +146,7 @@ public class Main
{
execute();
}
- catch(Throwable e)
+ catch(Exception e)
{
System.err.println("Exception during startup: " + e);
e.printStackTrace();
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Tue Aug 19 20:07:48 2014
@@ -101,7 +101,7 @@ public class AMQSession_0_10 extends AMQ
{
ssn.flushAcknowledgments(true);
}
- catch (Throwable t)
+ catch (Exception t)
{
_logger.error("error flushing acks", t);
}
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java Tue Aug 19 20:07:48 2014
@@ -20,12 +20,12 @@
*/
package org.apache.qpid.client.message;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.FieldTable;
+
public class FieldTableSupport
{
private FieldTableSupport()
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Tue Aug 19 20:07:48 2014
@@ -172,6 +172,10 @@ public class AMQProtocolHandler implemen
private long _writtenBytes;
private long _readBytes;
+ private int _messageReceivedCount;
+ private int _messagesOut;
+
+
private NetworkConnection _network;
private Sender<ByteBuffer> _sender;
private long _lastReadTime = System.currentTimeMillis();
@@ -451,9 +455,6 @@ public class AMQProtocolHandler implemen
_lastFailoverException = null;
}
- private static int _messageReceivedCount;
-
-
public void received(ByteBuffer msg)
{
_readBytes += msg.remaining();
@@ -559,8 +560,6 @@ public class AMQProtocolHandler implemen
}
- private static int _messagesOut;
-
public StateWaiter createWaiter(Set<AMQState> states) throws AMQException
{
return getStateManager().createWaiter(states);
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java Tue Aug 19 20:07:48 2014
@@ -20,6 +20,11 @@
*/
package org.apache.qpid.client.util;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,11 +32,6 @@ import org.apache.qpid.AMQException;
import org.apache.qpid.AMQTimeoutException;
import org.apache.qpid.client.failover.FailoverException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
/**
* BlockingWaiter is a 'rendezvous' which delegates handling of
* incoming Objects to a listener implemented as a sub-class of this and hands off the process or
@@ -243,7 +243,7 @@ public abstract class BlockingWaiter<T>
}
else
{
- _logger.error("WARNING: new error '" + e == null ? "null" : e.getMessage() + "' arrived while old one not yet processed:" + _error.getMessage());
+ _logger.error("WARNING: new error '" + (e == null ? "null" : e.getMessage()) + "' arrived while old one not yet processed:" + _error.getMessage());
}
if (_waiting.get())
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java Tue Aug 19 20:07:48 2014
@@ -136,42 +136,42 @@ public class BasicContentHeaderPropertie
{
int size = 0;
- if ((_propertyFlags & (CONTENT_TYPE_MASK)) > 0)
+ if ((_propertyFlags & (CONTENT_TYPE_MASK)) != 0)
{
size += EncodingUtils.encodedShortStringLength(_contentType);
}
- if ((_propertyFlags & ENCODING_MASK) > 0)
+ if ((_propertyFlags & ENCODING_MASK) != 0)
{
size += EncodingUtils.encodedShortStringLength(_encoding);
}
- if ((_propertyFlags & HEADERS_MASK) > 0)
+ if ((_propertyFlags & HEADERS_MASK) != 0)
{
size += EncodingUtils.encodedFieldTableLength(_headers);
}
- if ((_propertyFlags & DELIVERY_MODE_MASK) > 0)
+ if ((_propertyFlags & DELIVERY_MODE_MASK) != 0)
{
size += 1;
}
- if ((_propertyFlags & PRIORITY_MASK) > 0)
+ if ((_propertyFlags & PRIORITY_MASK) != 0)
{
size += 1;
}
- if ((_propertyFlags & CORRELATION_ID_MASK) > 0)
+ if ((_propertyFlags & CORRELATION_ID_MASK) != 0)
{
size += EncodingUtils.encodedShortStringLength(_correlationId);
}
- if ((_propertyFlags & REPLY_TO_MASK) > 0)
+ if ((_propertyFlags & REPLY_TO_MASK) != 0)
{
size += EncodingUtils.encodedShortStringLength(_replyTo);
}
- if ((_propertyFlags & EXPIRATION_MASK) > 0)
+ if ((_propertyFlags & EXPIRATION_MASK) != 0)
{
if (_expiration == 0L)
{
@@ -183,32 +183,32 @@ public class BasicContentHeaderPropertie
}
}
- if ((_propertyFlags & MESSAGE_ID_MASK) > 0)
+ if ((_propertyFlags & MESSAGE_ID_MASK) != 0)
{
size += EncodingUtils.encodedShortStringLength(_messageId);
}
- if ((_propertyFlags & TIMESTAMP_MASK) > 0)
+ if ((_propertyFlags & TIMESTAMP_MASK) != 0)
{
size += 8;
}
- if ((_propertyFlags & TYPE_MASK) > 0)
+ if ((_propertyFlags & TYPE_MASK) != 0)
{
size += EncodingUtils.encodedShortStringLength(_type);
}
- if ((_propertyFlags & USER_ID_MASK) > 0)
+ if ((_propertyFlags & USER_ID_MASK) != 0)
{
size += EncodingUtils.encodedShortStringLength(_userId);
}
- if ((_propertyFlags & APPLICATION_ID_MASK) > 0)
+ if ((_propertyFlags & APPLICATION_ID_MASK) != 0)
{
size += EncodingUtils.encodedShortStringLength(_appId);
}
- if ((_propertyFlags & CLUSTER_ID_MASK) > 0)
+ if ((_propertyFlags & CLUSTER_ID_MASK) != 0)
{
size += EncodingUtils.encodedShortStringLength(_clusterId);
}
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java Tue Aug 19 20:07:48 2014
@@ -210,7 +210,7 @@ final class IoReceiver implements Runnab
}
}
}
- catch (Throwable t)
+ catch (Exception t)
{
if (shouldReport(t))
{
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java Tue Aug 19 20:07:48 2014
@@ -21,13 +21,13 @@
package org.apache.qpid.transport.network.security.sasl;
+import javax.security.sasl.Sasl;
+import javax.security.sasl.SaslClient;
+
import org.apache.qpid.transport.Connection;
import org.apache.qpid.transport.ConnectionException;
import org.apache.qpid.transport.ConnectionListener;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-
public abstract class SASLEncryptor implements ConnectionListener
{
private SaslClient saslClient;
@@ -45,7 +45,7 @@ public abstract class SASLEncryptor impl
if (conn.getSaslClient() != null)
{
saslClient = conn.getSaslClient();
- if (saslClient.isComplete() && saslClient.getNegotiatedProperty(Sasl.QOP) == "auth-conf")
+ if (saslClient.isComplete() && "auth-conf".equals(saslClient.getNegotiatedProperty(Sasl.QOP)))
{
sendBuffSize = Integer.parseInt(
(String)saslClient.getNegotiatedProperty(Sasl.RAW_SEND_SIZE));
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java Tue Aug 19 20:07:48 2014
@@ -151,15 +151,15 @@ public class URLHelper
}
else
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append('?');
- for (String key : options.keySet())
+ for (Map.Entry<String,String> entry : options.entrySet())
{
- sb.append(key);
+ sb.append(entry.getKey());
sb.append("='");
- sb.append(options.get(key));
+ sb.append(entry.getValue());
sb.append("'");
sb.append(DEFAULT_OPTION_SEPERATOR);
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java Tue Aug 19 20:07:48 2014
@@ -323,9 +323,9 @@ public final class Strings
sb.append("<");
if (map != null)
{
- for(String key : map.keySet())
+ for(Map.Entry<String,Object> entry : map.entrySet())
{
- sb.append(key).append(" = ").append(map.get(key)).append(" ");
+ sb.append(entry.getKey()).append(" = ").append(entry.getValue()).append(" ");
}
}
sb.append(">");
Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java (original)
+++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java Tue Aug 19 20:07:48 2014
@@ -25,10 +25,11 @@ import java.util.concurrent.ThreadFactor
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import org.apache.qpid.disttest.message.ParticipantResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.qpid.disttest.message.ParticipantResult;
+
public class ParticipantExecutor
{
private static final Logger LOGGER = LoggerFactory.getLogger(ParticipantExecutor.class);
@@ -100,7 +101,7 @@ public class ParticipantExecutor
}
result = _participant.doIt(_client.getClientName());
}
- catch (Throwable t)
+ catch (Exception t)
{
String errorMessage = "Unhandled error: " + t.getMessage();
LOGGER.error(errorMessage, t);
Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java (original)
+++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java Tue Aug 19 20:07:48 2014
@@ -26,6 +26,9 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.disttest.DistributedTestException;
import org.apache.qpid.disttest.controller.config.QueueConfig;
import org.apache.qpid.disttest.controller.config.TestInstance;
@@ -36,8 +39,6 @@ import org.apache.qpid.disttest.message.
import org.apache.qpid.disttest.message.Response;
import org.apache.qpid.disttest.message.StartTestCommand;
import org.apache.qpid.disttest.message.TearDownTestCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestRunner
{
@@ -72,7 +73,7 @@ public class TestRunner
{
deleteQueues();
}
- catch (Throwable t)
+ catch (Exception t)
{
LOGGER.error("Failed to delete test queues during shutdown", t);
}
Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java (original)
+++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java Tue Aug 19 20:07:48 2014
@@ -36,13 +36,14 @@ import javax.jms.Session;
import javax.naming.Context;
import javax.naming.NamingException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.disttest.DistributedTestException;
import org.apache.qpid.disttest.controller.CommandListener;
import org.apache.qpid.disttest.controller.config.QueueConfig;
import org.apache.qpid.disttest.message.Command;
import org.apache.qpid.disttest.message.RegisterClientCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ControllerJmsDelegate
{
@@ -121,7 +122,7 @@ public class ControllerJmsDelegate
processCommandWithFirstSupportingListener(command);
LOGGER.debug("Finished processing command for message " + jmsMessageID);
}
- catch (Throwable t)
+ catch (Exception t)
{
LOGGER.error("Can't handle JMS message", t);
}
Modified: qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1618964&r1=1618963&r2=1618964&view=diff
==============================================================================
--- qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Tue Aug 19 20:07:48 2014
@@ -74,7 +74,7 @@ public class QpidTestCase extends TestCa
String testExcludes = System.getProperty(TEST_EXCLUDES);
//For the maven build, process the test.excludes property
- if(testExcludes != null && exclusionListURIs == "")
+ if(testExcludes != null && "".equals(exclusionListURIs))
{
for (String exclude : testExcludes.split("\\s+"))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org