You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/04/11 22:53:15 UTC

[1/2] activemq-artemis git commit: This closes #451

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 39125546e -> c2d51c07f


This closes #451


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c2d51c07
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c2d51c07
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c2d51c07

Branch: refs/heads/master
Commit: c2d51c07f0b589ca8183cc4d653e35d210e5bf71
Parents: 3912554 b5ffda4
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Apr 11 16:53:10 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Apr 11 16:53:10 2016 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[2/2] activemq-artemis git commit: Fix getter and setter validation test

Posted by cl...@apache.org.
Fix getter and setter validation test


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b5ffda47
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b5ffda47
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b5ffda47

Branch: refs/heads/master
Commit: b5ffda4701d5e864e3991200df4406a7f8be92ac
Parents: 3912554
Author: Ville Skyttä <vi...@iki.fi>
Authored: Sun Apr 10 12:37:39 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Apr 11 16:53:10 2016 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b5ffda47/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 3581924..4fd98db 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -1050,7 +1050,7 @@ public abstract class ActiveMQTestBase extends Assert {
          if (value != null && prop.getWriteMethod() != null && prop.getReadMethod() == null) {
             System.out.println("WriteOnly property " + prop.getName() + " on " + pojo.getClass());
          }
-         else if (value != null & prop.getWriteMethod() != null &&
+         else if (value != null && prop.getWriteMethod() != null &&
             prop.getReadMethod() != null &&
             !ignoreSet.contains(prop.getName())) {
             System.out.println("Validating " + prop.getName() + " type = " + prop.getPropertyType());