Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #1299

This commit is contained in:
Clebert Suconic 2017-05-30 09:54:17 -04:00
parent c4663d8fb4 b8ebe05775
commit df4baeff03
4 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
View File

@ -93,8 +93,7 @@ public class ServerUtil {
try (ActiveMQConnectionFactory cf = ActiveMQJMSClient.createConnectionFactory(uri, null)) {
cf.createConnection().close();
System.out.println("server " + uri + " started");
}
catch (Exception e) {
} catch (Exception e) {
System.out.println("awaiting server " + uri + " start at ");
Thread.sleep(500);
continue;

20
artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/ResourceLimitSettings.java
View File

@ -142,6 +142,26 @@ public class ResourceLimitSettings implements Serializable, EncodingSupport {
return result;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
ResourceLimitSettings that = (ResourceLimitSettings) o;
if (match != null ? !match.equals(that.match) : that.match != null) {
return false;
}
if (maxConnections != null ? !maxConnections.equals(that.maxConnections) : that.maxConnections != null) {
return false;
}
return maxQueues != null ? maxQueues.equals(that.maxQueues) : that.maxQueues == null;
}
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/

6
etc/checkstyle.xml
View File

@ -46,7 +46,9 @@ under the License.
<!-- Modifier Checks -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<module name="RedundantModifier">
<property name="tokens" value="ANNOTATION_FIELD_DEF, INTERFACE_DEF, CLASS_DEF, ENUM_DEF"/>
</module>
<!-- Checks for common coding problems -->
<module name="EmptyStatement"/>
@ -71,7 +73,7 @@ under the License.
<module name="RightCurly"/>
<module name="RightCurly">
<property name="option" value="alone"/>
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
</module>
<!-- Checks that there is no whitespace after certain tokens; e.g. "." and "!". -->
<module name="NoWhitespaceAfter"/>

17
pom.xml
View File

@ -1249,9 +1249,14 @@
<version>2.17</version>
<dependencies>
<dependency>
<groupId>com.github.sevntu.checkstyle</groupId>
<groupId>com.github.sevntu-checkstyle</groupId>
<artifactId>sevntu-checkstyle-maven-plugin</artifactId>
<version>1.21.0</version>
<version>1.24.0</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>7.7</version>
</dependency>
</dependencies>
<configuration>
@ -1446,12 +1451,4 @@
</plugins>
</reporting>
<pluginRepositories>
<pluginRepository>
<id>sevntu-maven</id>
<name>sevntu-maven</name>
<url>http://sevntu-checkstyle.github.io/sevntu.checkstyle/maven2</url>
</pluginRepository>
</pluginRepositories>
</project>