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/13 21:59:10 UTC
svn commit: r1617822 - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-plugins/management-http/s...
Author: rgodfrey
Date: Wed Aug 13 19:59:09 2014
New Revision: 1617822
URL: http://svn.apache.org/r1617822
Log:
QPID-5993 : Fix more findbugs found issues
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java Wed Aug 13 19:59:09 2014
@@ -281,4 +281,10 @@ class HeadersBinding
return true;
}
+
+ @Override
+ public int hashCode()
+ {
+ return _binding == null ? 0 : _binding.hashCode();
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Wed Aug 13 19:59:09 2014
@@ -318,7 +318,7 @@ public abstract class AbstractConfigured
checkCandidate((Class<? extends ConfiguredObject>) interfaceClass, candidates);
}
}
- if(clazz.getSuperclass() != null & ConfiguredObject.class.isAssignableFrom(clazz.getSuperclass()))
+ if(clazz.getSuperclass() != null && ConfiguredObject.class.isAssignableFrom(clazz.getSuperclass()))
{
findBestFitInterface((Class<? extends ConfiguredObject>) clazz.getSuperclass(), candidates);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java Wed Aug 13 19:59:09 2014
@@ -186,6 +186,7 @@ public abstract class AbstractSystemConf
ConfiguredObjectRecordConverter converter = new ConfiguredObjectRecordConverter(BrokerModel.getInstance());
Reader reader;
+
try
{
URL url = new URL(initialConfigurationLocation);
@@ -196,9 +197,18 @@ public abstract class AbstractSystemConf
reader = new FileReader(initialConfigurationLocation);
}
- Collection<ConfiguredObjectRecord> records = converter.readFromJson(org.apache.qpid.server.model.Broker.class,
- systemConfig, reader);
- return records.toArray(new ConfiguredObjectRecord[records.size()]);
+ try
+ {
+ Collection<ConfiguredObjectRecord> records =
+ converter.readFromJson(org.apache.qpid.server.model.Broker.class,
+ systemConfig, reader);
+ return records.toArray(new ConfiguredObjectRecord[records.size()]);
+ }
+ finally
+ {
+ reader.close();
+ }
+
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Wed Aug 13 19:59:09 2014
@@ -2925,7 +2925,7 @@ public abstract class AbstractQueue<X ex
if(existingPolicy != _exclusive)
{
ExclusivityPolicy newPolicy = _exclusive;
- _exclusive = newPolicy;
+ _exclusive = existingPolicy;
updateExclusivityPolicy(newPolicy);
}
return true;
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java Wed Aug 13 19:59:09 2014
@@ -61,23 +61,24 @@ public class DefinedFileServlet extends
{
try (OutputStream output = HttpManagementUtil.getOutputStream(request, response))
{
- InputStream fileInput = getClass().getResourceAsStream("/resources/" + _filename);
-
- if (fileInput != null)
+ try(InputStream fileInput = getClass().getResourceAsStream("/resources/" + _filename))
{
- byte[] buffer = new byte[1024];
- response.setStatus(HttpServletResponse.SC_OK);
- int read = 0;
+ if (fileInput != null)
+ {
+ byte[] buffer = new byte[1024];
+ response.setStatus(HttpServletResponse.SC_OK);
+ int read = 0;
- while ((read = fileInput.read(buffer)) > 0)
+ while ((read = fileInput.read(buffer)) > 0)
+ {
+ output.write(buffer, 0, read);
+ }
+ }
+ else
{
- output.write(buffer, 0, read);
+ response.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown file: " + _filename);
}
}
- else
- {
- response.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown file: " + _filename);
- }
}
}
}
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Wed Aug 13 19:59:09 2014
@@ -2101,7 +2101,7 @@ public abstract class AMQSession<C exten
void deregisterProducer(long producerId)
{
- _producers.remove(new Long(producerId));
+ _producers.remove(producerId);
}
boolean isInRecovery()
@@ -2935,7 +2935,7 @@ public abstract class AMQSession<C exten
private void registerProducer(long producerId, MessageProducer producer)
{
- _producers.put(new Long(producerId), producer);
+ _producers.put(producerId, producer);
}
/**
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java Wed Aug 13 19:59:09 2014
@@ -20,10 +20,10 @@
*/
package org.apache.qpid.jms;
-import org.apache.qpid.transport.ConnectionSettings;
-
import java.util.Map;
+import org.apache.qpid.transport.ConnectionSettings;
+
public interface BrokerDetails
{
@@ -104,9 +104,5 @@ public interface BrokerDetails
boolean getBooleanProperty(String propName);
- String toString();
-
- boolean equals(Object o);
-
ConnectionSettings buildConnectionSettings();
}
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java Wed Aug 13 19:59:09 2014
@@ -50,7 +50,7 @@ public class ConstantExpression implemen
public static final BooleanConstantExpression TRUE = new BooleanConstantExpression(Boolean.TRUE);
public static final BooleanConstantExpression FALSE = new BooleanConstantExpression(Boolean.FALSE);
- private Object value;
+ private Object _value;
public static ConstantExpression createFromDecimal(String text)
{
@@ -64,7 +64,7 @@ public class ConstantExpression implemen
Number value;
try
{
- value = new Long(text);
+ value = Long.valueOf(text);
}
catch (NumberFormatException e)
{
@@ -114,17 +114,17 @@ public class ConstantExpression implemen
public ConstantExpression(Object value)
{
- this.value = value;
+ this._value = value;
}
public Object evaluate(FilterableMessage message)
{
- return value;
+ return _value;
}
public Object getValue()
{
- return value;
+ return _value;
}
/**
@@ -132,22 +132,22 @@ public class ConstantExpression implemen
*/
public String toString()
{
- if (value == null)
+ if (_value == null)
{
return "NULL";
}
- if (value instanceof Boolean)
+ if (_value instanceof Boolean)
{
- return ((Boolean) value) ? "TRUE" : "FALSE";
+ return ((Boolean) _value) ? "TRUE" : "FALSE";
}
- if (value instanceof String)
+ if (_value instanceof String)
{
- return encodeString((String) value);
+ return encodeString((String) _value);
}
- return value.toString();
+ return _value.toString();
}
/**
@@ -186,7 +186,7 @@ public class ConstantExpression implemen
*/
public static String encodeString(String s)
{
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
b.append('\'');
for (int i = 0; i < s.length(); i++)
{
Modified: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java (original)
+++ qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java Wed Aug 13 19:59:09 2014
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.management.common.sasl;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
@@ -28,8 +31,6 @@ import javax.security.auth.callback.Unsu
import javax.security.sasl.Sasl;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
public class PlainSaslClient implements SaslClient
{
@@ -170,9 +171,10 @@ public class PlainSaslClient implements
clearPassword();
}
- protected void finalize()
+ protected void finalize() throws Throwable
{
clearPassword();
+ super.finalize();
}
private Object[] getUserInfo() throws SaslException
Modified: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java (original)
+++ qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java Wed Aug 13 19:59:09 2014
@@ -19,12 +19,13 @@
*/
package org.apache.qpid.management.common.sasl;
+import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
public class UserPasswordCallbackHandler implements CallbackHandler
{
@@ -70,8 +71,9 @@ public class UserPasswordCallbackHandler
}
}
- protected void finalize()
+ protected void finalize() throws Throwable
{
clearPassword();
+ super.finalize();
}
}
Modified: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java (original)
+++ qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java Wed Aug 13 19:59:09 2014
@@ -20,15 +20,16 @@
*/
package org.apache.qpid.management.common.sasl;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
public class UsernameHashedPasswordCallbackHandler implements CallbackHandler
@@ -76,9 +77,10 @@ public class UsernameHashedPasswordCallb
}
}
- protected void finalize()
+ protected void finalize() throws Throwable
{
clearPassword();
+ super.finalize();
}
public static char[] getHash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException
Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java (original)
+++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java Wed Aug 13 19:59:09 2014
@@ -102,27 +102,27 @@ public abstract class NumericGeneratedPr
Number result = null;
if (targetType == double.class)
{
- result = new Double(value);
+ result = value;
}
else if (targetType == float.class)
{
- result = new Float(value);
+ result = (float) value;
}
else if (targetType == int.class)
{
- result = new Integer((int) value);
+ result = (int) value;
}
else if (targetType == long.class)
{
- result = new Long((long) value);
+ result = (long) value;
}
else if (targetType == short.class)
{
- result = new Short((short) value);
+ result = (short) value;
}
else if (targetType == byte.class)
{
- result = new Byte((byte) value);
+ result = (byte) value;
}
else
{
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=1617822&r1=1617821&r2=1617822&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 Wed Aug 13 19:59:09 2014
@@ -90,9 +90,9 @@ public class QpidTestCase extends TestCa
if (file.exists())
{
_logger.info("Using exclude file: " + uri);
- try
+ try(FileReader fileReader = new FileReader(file))
{
- BufferedReader in = new BufferedReader(new FileReader(file));
+ BufferedReader in = new BufferedReader(fileReader);
String excludedTest = in.readLine();
do
{
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1617822&r1=1617821&r2=1617822&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Wed Aug 13 19:59:09 2014
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.MalformedURLException;
@@ -114,7 +115,10 @@ public class TestBrokerConfiguration
try
{
URL url = new URL(initialStoreLocation);
- reader = new InputStreamReader(url.openStream());
+ try(InputStream urlStream = url.openStream())
+ {
+ reader = new InputStreamReader(urlStream);
+ }
}
catch (MalformedURLException e)
{
@@ -122,6 +126,8 @@ public class TestBrokerConfiguration
}
Collection<ConfiguredObjectRecord> records = converter.readFromJson(org.apache.qpid.server.model.Broker.class, parentObject, reader);
+ reader.close();
+
_store = new AbstractMemoryStore(Broker.class){};
ConfiguredObjectRecord[] initialRecords = records.toArray(new ConfiguredObjectRecord[records.size()]);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org